diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-12 03:24:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-13 23:01:07 -0400 |
| commit | 4c50e5ab3a393c6d86fc6362c58f7ecf32dd9680 (patch) | |
| tree | 1251c98b95b58326788e67c7e6f63bb2984e7f8f | |
| parent | 8c01b9d05aa5d5449398d5babdf7fa1fe95af1c2 (diff) | |
| download | gnu-guix-4c50e5ab3a393c6d86fc6362c58f7ecf32dd9680.tar gnu-guix-4c50e5ab3a393c6d86fc6362c58f7ecf32dd9680.tar.gz | |
gnu: python: Disable ssl test that fails with openssl-1.0.2b.
* gnu/packages/patches/python-disable-ssl-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/python.scm (python): Add patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-disable-ssl-test.patch | 12 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 7e0ee52875..fd7b1e5e86 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -526,6 +526,7 @@ dist_patch_DATA = \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ + gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ gnu/packages/patches/python-libffi-mips-n32-fix.patch \ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ diff --git a/gnu/packages/patches/python-disable-ssl-test.patch b/gnu/packages/patches/python-disable-ssl-test.patch new file mode 100644 index 0000000000..e351c77505 --- /dev/null +++ b/gnu/packages/patches/python-disable-ssl-test.patch @@ -0,0 +1,12 @@ +Disable a test that fails with openssl-1.0.2b. + +--- Lib/test/test_ssl.py.orig 2015-02-25 06:27:45.000000000 -0500 ++++ Lib/test/test_ssl.py 2015-06-12 03:14:09.395212502 -0400 +@@ -2718,6 +2718,7 @@ + chatty=True, connectionchatty=True) + self.assertIs(stats['compression'], None) + ++ @unittest.skipIf(True, "openssl 1.0.2b complains: dh key too small") + def test_dh_params(self): + # Check we can get a connection with ephemeral Diffie-Hellman + context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 914c2dc23c..232a785778 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -207,7 +207,9 @@ data types.") (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches (list (search-patch "python-fix-tests.patch"))) + (patches (list (search-patch "python-fix-tests.patch") + ;; XXX Try removing this patch for python > 3.4.3 + (search-patch "python-disable-ssl-test.patch"))) (patch-flags '("-p0")) (sha256 (base32 |