diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
| commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
| tree | c12187a787b934fb79d159046a4a5516e5d39f97 /gnu/packages/patches/python-disable-ssl-test.patch | |
| parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
| parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) | |
| download | guix-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/commencement.scm gnu/packages/xml.scm
Diffstat (limited to 'gnu/packages/patches/python-disable-ssl-test.patch')
| -rw-r--r-- | gnu/packages/patches/python-disable-ssl-test.patch | 12 |
1 files changed, 12 insertions, 0 deletions
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) |