mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 11:25:22 -05:00
72df668061
* gnu/packages/patches/python-3.4-fix-tests.patch, gnu/packages/patches/python-3.5-fix-tests.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/patches/python-fix-tests.patch: Move python-3.4 specific hunk to 'gnu/packages/patches/python-3.4-fix-tests.patch'. * gnu/packages/python.scm (python-3.5): New variable. (python-3.4): Inherit from python-3.5. [source]: Use 'gnu/packages/patches/python-3.4-fix-tests.patch'. (python-3): Point to python-3.5. Co-authored-by: Diane Trout <diane@ghic.org> Co-authored-by: Christopher Allan Webber <cwebber@dustycloud.org>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
Additional test fixes which affect Python 3.5 (and presumably later) but not
|
|
prior revisions of Python.
|
|
|
|
--- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100
|
|
+++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100
|
|
@@ -1986,8 +1986,9 @@
|
|
expect = set() if not support.fs_is_case_insensitive(BASE) else given
|
|
self.assertEqual(given, expect)
|
|
self.assertEqual(set(p.rglob("FILEd*")), set())
|
|
|
|
+ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests")
|
|
def test_expanduser(self):
|
|
P = self.cls
|
|
support.import_module('pwd')
|
|
import pwd
|
|
--- Lib/test/test_tarfile.py 2016-02-24 19:22:52.597208055 +0000
|
|
+++ Lib/test/test_tarfile.py 2016-02-24 20:50:48.941950135 +0000
|
|
@@ -2305,11 +2305,14 @@
|
|
try:
|
|
import pwd, grp
|
|
except ImportError:
|
|
return False
|
|
- if pwd.getpwuid(0)[0] != 'root':
|
|
- return False
|
|
- if grp.getgrgid(0)[0] != 'root':
|
|
+ try:
|
|
+ if pwd.getpwuid(0)[0] != 'root':
|
|
+ return False
|
|
+ if grp.getgrgid(0)[0] != 'root':
|
|
+ return False
|
|
+ except KeyError:
|
|
return False
|
|
return True
|
|
|
|
|
|
--- 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))
|
|
|
|
+ @unittest.skipUnless(support.is_resource_enabled('network'),
|
|
+ 'network is not enabled')
|
|
def test_getaddrinfo_servname(self):
|
|
INET = socket.AF_INET
|
|
STREAM = socket.SOCK_STREAM
|