[Python-modules-commits] [m2crypto] 05/06: add sni-test-race.patch; deb/changelog: finalize, upload to unstable

[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 abd989cb0718982b0b27223f55a5e880fa0d3b70
Author: Daniel Stender <stender at debian.org>
Date:   Mon Nov 13 14:19:06 2017 +0100

    add sni-test-race.patch; deb/changelog: finalize, upload to unstable
---
 debian/changelog                     | 10 ++++------
 debian/patches/skip-some-tests.patch | 16 ----------------
 debian/patches/sni-test-race.patch   | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7993f8..fc4ab54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,13 @@
-m2crypto (0.27.0-3) UNRELEASED; urgency=medium
+m2crypto (0.27.0-3) unstable; urgency=medium
 
   * deb/rules:
-    + unset $http{,s}_proxy set by pybuild for tests.
+    + unset $http{,s}_proxy (set by pybuild) for tests.
     + run elinks with fixed locale C.UTF-8 for reproducible buiding.
     + drop override for dh_compress (example scripts aren't shipped
       anymore).
-  * skip-some-tests.patch:
-    + remove skip of test_urllib.
-    + add pointer to related pull request for the remaining skip.
+  * drop skip-some-tests.patch, add sni-test-race.patch.
 
- -- Daniel Stender <stender at debian.org>  Mon, 13 Nov 2017 11:42:03 +0100
+ -- Daniel Stender <stender at debian.org>  Mon, 13 Nov 2017 14:19:19 +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
deleted file mode 100644
index 2352516..0000000
--- a/debian/patches/skip-some-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: skip some problematic tests to prevent FTBFS
-Author: Daniel Stender <stender at debian.org>
-Bug: https://gitlab.com/m2crypto/m2crypto/merge_requests/141
-Forwarded: no-needed
-Last-Update: 2017-11-12
-
---- a/tests/test_ssl.py
-+++ b/tests/test_ssl.py
-@@ -238,6 +238,7 @@
-         finally:
-             self.stop_server(pid)
- 
-+    @unittest.skip('temporarily disabled to prevent FTBFS')
-     def test_HTTPSConnection_SNI_support(self):
-         args = ['s_server', '-servername', srv_host, '-debug', '-www',
-                 '-cert', 'server.pem', '-key', 'server_key.pem',
diff --git a/debian/patches/sni-test-race.patch b/debian/patches/sni-test-race.patch
new file mode 100644
index 0000000..465e4fa
--- /dev/null
+++ b/debian/patches/sni-test-race.patch
@@ -0,0 +1,16 @@
+Description: mitigate a race condition in test_HTTPSConnection_SNI_support
+ Fixes FTBFS on ppc64el and other archs, like with 0.27.0-1 in experimental.
+Author: Miloslav Trmač
+Origin: https://gitlab.com/m2crypto/m2crypto/merge_requests/141/diffs
+Applied-Upstream: https://gitlab.com/m2crypto/m2crypto/commit/35f5e5c3
+
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
+@@ -251,6 +251,7 @@
+             c.request('GET', '/')
+             c.close()
+         finally:
++            time.sleep(sleepTime)
+             out, err = self.stop_server(pid)
+         self.assertIn('Hostname in TLS extension: "%s"' % srv_host, out)
+ 

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