[Python-modules-commits] [m2crypto] 03/06: deb/rules: unset $http{, s}_proxy

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch debian/master
in repository m2crypto.

commit da565ed5d4ff4264f647a2528c2030c741fea94d
Author: Daniel Stender <stender at debian.org>
Date:   Mon Nov 13 10:21:58 2017 +0100

    deb/rules: unset $http{,s}_proxy
---
 debian/changelog                     | 11 +++++++----
 debian/patches/skip-some-tests.patch |  8 --------
 debian/rules                         |  4 ++++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6498a6d..86bd876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
 m2crypto (0.27.0-3) UNRELEASED; urgency=medium
 
-  * deb/rules: run elinks with fixed locale C.UTF-8 for
-    reproducible buiding.
-  * skip-some-tests.patch: add pointer to related pull request.
+  * deb/rules:
+    + unset $http{,s}_proxy set by pybuild for tests.
+    + run elinks with fixed locale C.UTF-8 for reproducible buiding.
+  * skip-some-tests.patch:
+    + remove skip of test_urllib.
+    + add pointer to related pull request for the remaining skip.
 
- -- Daniel Stender <stender at debian.org>  Mon, 13 Nov 2017 08:52:43 +0100
+ -- Daniel Stender <stender at debian.org>  Mon, 13 Nov 2017 11:08:22 +0100
 
 m2crypto (0.27.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/skip-some-tests.patch b/debian/patches/skip-some-tests.patch
index 11bc9cd..2352516 100644
--- a/debian/patches/skip-some-tests.patch
+++ b/debian/patches/skip-some-tests.patch
@@ -14,11 +14,3 @@ Last-Update: 2017-11-12
      def test_HTTPSConnection_SNI_support(self):
          args = ['s_server', '-servername', srv_host, '-debug', '-www',
                  '-cert', 'server.pem', '-key', 'server_key.pem',
-@@ -825,6 +826,7 @@
- 
- class UrllibSSLClientTestCase(BaseSSLClientTestCase):
- 
-+    @unittest.skip('temporarily disabled to prevent FTBFS')
-     def test_urllib(self):
-         pid = self.start_server(self.args)
-         try:
diff --git a/debian/rules b/debian/rules
index a7e73c4..0ee3217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 export PYBUILD_AFTER_BUILD=cp {build_dir}/M2Crypto/_m2crypto.so M2Crypto/
 # bindings needed inplace for tests and docs
 
+export http_proxy=
+export https_proxy=
+# override settings from pybuild, unset them is needed for tests
+
 %:
 	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/m2crypto.git