[Python-modules-commits] r25120 - in packages/circuits/trunk/debian (4 files)
eriol-guest at users.alioth.debian.org
eriol-guest at users.alioth.debian.org
Mon Jul 8 18:14:14 UTC 2013
Date: Monday, July 8, 2013 @ 18:14:12
Author: eriol-guest
Revision: 25120
Disable address check since these tests are conceived to run on the same machine
Added:
packages/circuits/trunk/debian/patches/03_disable-address-check.patch
(from rev 25119, packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch)
Modified:
packages/circuits/trunk/debian/changelog
packages/circuits/trunk/debian/patches/series
Deleted:
packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch
Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog 2013-07-08 14:48:09 UTC (rev 25119)
+++ packages/circuits/trunk/debian/changelog 2013-07-08 18:14:12 UTC (rev 25120)
@@ -3,8 +3,13 @@
* Upload to unstable
* debian/rules
- Simplified override_dh_auto_clean
+ * debian/patches/03_force-localhost-as-host-name.patch
+ - Renamed to 03_disable-address-check.patch
+ * debian/patch/03_disable-03_disable-address-check.patch
+ - Disable address check since these tests are conceived
+ to run on the same machine (Closes: #713757)
- -- Daniele Tricoli <eriol at mornie.org> Thu, 04 Jul 2013 21:53:10 +0200
+ -- Daniele Tricoli <eriol at mornie.org> Mon, 08 Jul 2013 19:47:29 +0200
circuits (2.1.0-1) experimental; urgency=low
Copied: packages/circuits/trunk/debian/patches/03_disable-address-check.patch (from rev 25119, packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch)
===================================================================
--- packages/circuits/trunk/debian/patches/03_disable-address-check.patch (rev 0)
+++ packages/circuits/trunk/debian/patches/03_disable-address-check.patch 2013-07-08 18:14:12 UTC (rev 25120)
@@ -0,0 +1,44 @@
+Description: Disable address check since these tests are conceived
+ to run on the same machine (they check the address against
+ gethostbyname(gethostname())): see #680799 and #713757 for more details.
+Author: Daniele Tricoli <eriol at mornie.org>
+Last-Update: 2013-07-08
+Forwarded: not-needed
+--- a/tests/web/test_logger.py
++++ b/tests/web/test_logger.py
+@@ -58,6 +58,11 @@
+ d["f"] = ""
+ d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++ try:
++ del d['h']
++ except KeyError:
++ pass
++
+ keys = list(d.keys())
+
+ for k in keys:
+@@ -93,6 +98,11 @@
+ d["f"] = ""
+ d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++ try:
++ del d['h']
++ except KeyError:
++ pass
++
+ keys = list(d.keys())
+
+ for k in keys:
+@@ -130,6 +140,11 @@
+ d["f"] = ""
+ d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++ try:
++ del d['h']
++ except KeyError:
++ pass
++
+ keys = list(d.keys())
+
+ for k in keys:
Deleted: packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch
===================================================================
--- packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch 2013-07-08 14:48:09 UTC (rev 25119)
+++ packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch 2013-07-08 18:14:12 UTC (rev 25120)
@@ -1,93 +0,0 @@
-Description: Force localhost as hostname and disable check for address if
- DEB_BUILD_OPTIONS contains "parallel" option. Since these tests are conceived
- not to run on parallel environment (they check the address against
- gethostbyname(gethostname())), in a parallel environment the address check is
- disabled. Also, localhost is forced because default /etc/hosts will return
- 127.0.1.1.
-Author: Daniele Tricoli <eriol at mornie.org>
-Last-Update: 2013-02-17
-Forwarded: not-needed
---- a/tests/web/test_logger.py
-+++ b/tests/web/test_logger.py
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
-
-+import os
- import sys
-
- try:
-@@ -7,7 +8,7 @@
- except ImportError:
- from io import StringIO # NOQA
-
--from socket import gaierror, gethostbyname, gethostname
-+from socket import gaierror, gethostbyname
-
- from circuits.web import Controller, Logger
-
-@@ -44,7 +45,7 @@
- s = logfile.read().strip()
-
- try:
-- address = gethostbyname(gethostname())
-+ address = gethostbyname('localhost')
- except gaierror:
- address = "127.0.0.1"
-
-@@ -58,6 +59,12 @@
- d["f"] = ""
- d["a"] = "Python-urllib/%s" % sys.version[:3]
-
-+ try:
-+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
-+ del d['h']
-+ except KeyError:
-+ pass
-+
- keys = list(d.keys())
-
- for k in keys:
-@@ -79,7 +86,7 @@
- s = logobj.message
-
- try:
-- address = gethostbyname(gethostname())
-+ address = gethostbyname('localhost')
- except gaierror:
- address = "127.0.0.1"
-
-@@ -93,6 +100,12 @@
- d["f"] = ""
- d["a"] = "Python-urllib/%s" % sys.version[:3]
-
-+ try:
-+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
-+ del d['h']
-+ except KeyError:
-+ pass
-+
- keys = list(d.keys())
-
- for k in keys:
-@@ -116,7 +129,7 @@
- s = logfile.read().strip()
-
- try:
-- address = gethostbyname(gethostname())
-+ address = gethostbyname('localhost')
- except gaierror:
- address = "127.0.0.1"
-
-@@ -130,6 +143,12 @@
- d["f"] = ""
- d["a"] = "Python-urllib/%s" % sys.version[:3]
-
-+ try:
-+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
-+ del d['h']
-+ except KeyError:
-+ pass
-+
- keys = list(d.keys())
-
- for k in keys:
Modified: packages/circuits/trunk/debian/patches/series
===================================================================
--- packages/circuits/trunk/debian/patches/series 2013-07-08 14:48:09 UTC (rev 25119)
+++ packages/circuits/trunk/debian/patches/series 2013-07-08 18:14:12 UTC (rev 25120)
@@ -1,4 +1,4 @@
01_disable_sphinxcontrib_extensions.patch
02_remove_templatebuiltins_js.patch
-03_force-localhost-as-host-name.patch
+03_disable-address-check.patch
04_fix-python3-sintax-error.patch
More information about the Python-modules-commits
mailing list