diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/patches/python-fix-tests.patch | 66 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 21 |
2 files changed, 86 insertions, 1 deletions
diff --git a/gnu/packages/patches/python-fix-tests.patch b/gnu/packages/patches/python-fix-tests.patch new file mode 100644 index 0000000000..fecebdacde --- /dev/null +++ b/gnu/packages/patches/python-fix-tests.patch @@ -0,0 +1,66 @@ +See the discussion about the issues fixed here at: +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 @@ + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @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 ++ @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() + +--- Lib/test/test_posixpath.py 2014-03-01 05:46:56.984311000 +0100 ++++ Lib/test/test_posixpath.py 2014-03-07 00:59:20.888311000 +0100 +@@ -319,7 +319,11 @@ + del env['HOME'] + home = pwd.getpwuid(os.getuid()).pw_dir + # $HOME can end with a trailing /, so strip it (see #17809) +- self.assertEqual(posixpath.expanduser("~"), home.rstrip("/")) ++ # The Guix builders have '/' as a home directory, so ++ # home.rstrip("/") will be an empty string and the test will ++ # fail. Let's just disable it since it does not really make ++ # sense with such a bizarre setup. ++ # self.assertEqual(posixpath.expanduser("~"), home.rstrip("/")) + + def test_normpath(self): + self.assertEqual(posixpath.normpath(""), ".") +--- 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 @@ + self.assertRaises(OverflowError, socket.htonl, k) + self.assertRaises(OverflowError, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1104,6 +1106,8 @@ + self.assertRaises(ValueError, s.ioctl, -1, None) + s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100)) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1174,6 +1178,8 @@ + # only IP addresses are allowed + self.assertRaises(socket.error, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2c6992692a..01de2f6a4a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -146,8 +146,17 @@ (substitute* "Lib/subprocess.py" (("args = \\[\"/bin/sh") (string-append "args = [\"" (which "sh")))) + (substitute* + '("Lib/distutils/tests/test_spawn.py" + "Lib/test/test_subprocess.py") + (("/bin/sh") (which "sh"))) (apply configure args))) - %standard-phases)))) + (alist-cons-before + 'check 'pre-check + (lambda _ + ;; 'Lib/test/test_site.py' needs a valid $HOME + (setenv "HOME" (getcwd))) + %standard-phases))))) (inputs `(("bzip2" ,bzip2) ("gdbm" ,gdbm) @@ -183,9 +192,19 @@ 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"))) + (patch-flags '("-p0")) (sha256 (base32 "11f6hg9wdhm6hyzj49gxlvvp1s0l5hqgcsq1i4ayygqs1arpb4ik")))) + (arguments + (let ((args `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + ,@(package-arguments python-2)))) + (substitute-keyword-arguments args + ((#:tests? _) #t)))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") |