diff options
| -rw-r--r-- | gnu/packages/patches/python-3.5-fix-tests.patch | 37 | ||||
| -rw-r--r-- | gnu/packages/patches/python-fix-tests.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 4 |
3 files changed, 40 insertions, 18 deletions
diff --git a/gnu/packages/patches/python-3.5-fix-tests.patch b/gnu/packages/patches/python-3.5-fix-tests.patch index 46d2a84efb..9778b88dbd 100644 --- a/gnu/packages/patches/python-3.5-fix-tests.patch +++ b/gnu/packages/patches/python-3.5-fix-tests.patch @@ -35,12 +35,35 @@ prior revisions of Python. --- Lib/test/test_asyncio/test_base_events.py +++ Lib/test/test_asyncio/test_base_events.py -@@ -142,6 +142,8 @@ class BaseEventTests(test_utils.TestCase): - (INET, STREAM, TCP, '', ('1.2.3.4', 1)), - base_events._ipaddr_info('1.2.3.4', b'1', INET, STREAM, TCP)) - +@@ -1216,6 +1216,8 @@ + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') - def test_getaddrinfo_servname(self): - INET = socket.AF_INET - STREAM = socket.SOCK_STREAM + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value + +--- Lib/test/test_pdb.py.org 2017-03-12 03:09:01.991856701 +0100 ++++ Lib/test/test_pdb.py 2017-03-12 03:26:17.742572869 +0100 + +For some reason, KeyboardInterrupts do not work in the build +environment (lack of controlling TTY?). Just change the expected +outcome. Unfortunately, this will make it fail for users running +`python -m test test_pdb test_pdb` interactively. + +@@ -928,11 +928,11 @@ + > <doctest test.test_pdb.test_pdb_issue_20766[0]>(6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 1: <built-in function default_int_handler> ++ pdb 1: Handlers.SIG_IGN + > <doctest test.test_pdb.test_pdb_issue_20766[0]>(5)test_function() + -> sess.set_trace(sys._getframe()) + (Pdb) continue +- pdb 2: <built-in function default_int_handler> ++ pdb 2: Handlers.SIG_IGN + """ + + class PdbTestCase(unittest.TestCase): diff --git a/gnu/packages/patches/python-fix-tests.patch b/gnu/packages/patches/python-fix-tests.patch index e093307c51..d8f69866fd 100644 --- a/gnu/packages/patches/python-fix-tests.patch +++ b/gnu/packages/patches/python-fix-tests.patch @@ -3,23 +3,22 @@ http://bugs.python.org/issue20868 . --- Lib/test/test_shutil.py 2014-03-01 03:02:36.088311000 +0100 +++ Lib/test/test_shutil.py 2014-03-01 04:56:37.768311000 +0100 -@@ -1053,6 +1053,7 @@ +@@ -1127,6 +1127,7 @@ self.assertRaises(ValueError, make_archive, base_name, 'xxx') - - @requires_zlib + + @support.requires_zlib + @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") def test_make_archive_owner_group(self): # testing make_archive with owner and group, with various combinations # this works even if there's not gid/uid support -@@ -1081,6 +1082,7 @@ - - - @requires_zlib +@@ -1155,6 +1156,7 @@ + + + @support.requires_zlib + @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") def test_tarfile_root_owner(self): - tmpdir, tmpdir2, base_name = self._create_files() - + root_dir, base_dir = self._create_files() --- Lib/test/test_socket.py.orig 2014-03-02 22:14:12.264311000 +0100 +++ Lib/test/test_socket.py 2014-03-21 03:50:45.660311000 +0100 @@ -819,6 +819,8 @@ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8326de679d..6e41108df6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -317,7 +317,7 @@ data types.") (define-public python-3.5 (package (inherit python-2) - (version "3.5.2") + (version "3.5.3") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -330,7 +330,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0h6a5fr7ram2s483lh0pnmc4ncijb8llnpfdxdcl5dxr01hza400")) + "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf")) (snippet '(delete-file "Lib/ctypes/test/test_win32.py")))) ; fails on aarch64 |