From f0698133e7d6c353a3e6ae0fc62e57ba558a9bc0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 28 Oct 2020 22:55:05 -0400 Subject: [PATCH] Skip problematic Python 3 tests in Guix. A subset of the hunks in this patch is tracked upstream at https://bugs.python.org/issue38845, which was contributed by Tanguy Le Carrour . diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index e42c7ab4bd..8087c84dab 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -1695,6 +1695,7 @@ def _test_wait_result(cls, c, pid): if pid is not None: os.kill(pid, signal.SIGINT) + @unittest.skipIf(True, "This fails for unknown reasons on Guix") def test_wait_result(self): if isinstance(self, ProcessesMixin) and sys.platform != 'win32': pid = os.getpid() @@ -4150,6 +4151,7 @@ def test_shared_memory_across_processes(self): sms.close() @unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms") + @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") def test_shared_memory_SharedMemoryServer_ignores_sigint(self): # bpo-36368: protect SharedMemoryManager server process from # KeyboardInterrupt signals. diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 85c8152d49..e35cfffe84 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1377,6 +1377,8 @@ def test_create_connection_no_inet_pton(self, m_socket): self._test_create_connection_ip_addr(m_socket, False) @patch_socket + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') def test_create_connection_service_name(self, m_socket): m_socket.getaddrinfo = socket.getaddrinfo sock = m_socket.socket.return_value diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py index a41e94971d..1291af3057 100644 --- a/Lib/test/test_ctypes/test_find.py +++ b/Lib/test/test_ctypes/test_find.py @@ -117,6 +117,7 @@ def test_find_library_with_gcc(self): with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None): self.assertNotEqual(find_library('c'), None) + @unittest.skipIf(True, 'Fails on Guix.') def test_find_library_with_ld(self): with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \ unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None): diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 1ee9958445..ab6b41befe 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -34,6 +34,7 @@ def generator2(self): else: return "FAILED" + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') def test_raise_and_yield_from(self): gen = self.generator1() gen.send(None) diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index ec105ae1a0..ae4c5b672e 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -3069,6 +3069,7 @@ def test_rglob(self): 'pwd module does not expose getpwall()') @unittest.skipIf(sys.platform == "vxworks", "no home directory on VxWorks") + @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") def test_expanduser(self): P = self.cls import_helper.import_module('pwd') diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 51b844262e..004d3133cf 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -1580,6 +1580,7 @@ def test_pdb_next_command_subiterator(): (Pdb) continue """ +@unittest.skipIf(True, 'Fails on Guix… but skipIf not taken into account?!') def test_pdb_issue_20766(): """Test for reference leaks when the SIGINT handler is set. @@ -1598,11 +1599,11 @@ def test_pdb_issue_20766(): > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue - pdb 1: + pdb 1: 1 > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue - pdb 2: + pdb 2: 1 """ def test_pdb_issue_43318(): diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 2ab6f6a986..8cf6b4d1c8 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -1049,6 +1049,7 @@ def test_fromfile(self): output = self.run_tests('--fromfile', filename) self.check_executed_tests(output, tests, stats=stats) + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') def test_interrupted(self): code = TEST_INTERRUPTED test = self.create_test('sigint', code=code) @@ -1066,6 +1067,7 @@ def test_slowest(self): % (self.TESTNAME_REGEX, len(tests))) self.check_line(output, regex) + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') def test_slowest_interrupted(self): # Issue #25373: test --slowest with an interrupted test code = TEST_INTERRUPTED diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index 317e7ca8f8..7f272daf24 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -151,6 +151,7 @@ def test_freebsd_contants(self): @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') @support.requires_linux_version(2, 6, 36) + @unittest.skipIf(True, "Bug: the PermissionError is not raised") def test_prlimit(self): self.assertRaises(TypeError, resource.prlimit) self.assertRaises(ProcessLookupError, resource.prlimit, diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index bf60f37934..5e3a96380a 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1743,6 +1743,7 @@ def test_make_archive(self): base_name = os.path.join(tmpdir, 'archive') self.assertRaises(ValueError, make_archive, base_name, 'xxx') + @unittest.skipIf(True, "The Guix build container has no root user") @support.requires_zlib() def test_make_archive_owner_group(self): # testing make_archive with owner and group, with various combinations @@ -1771,6 +1772,7 @@ def test_make_archive_owner_group(self): self.assertTrue(os.path.isfile(res)) + @unittest.skipIf(True, "The Guix build container has no root user") @support.requires_zlib() @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") def test_tarfile_root_owner(self): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 637a0ca3b3..2fb804e340 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -160,6 +160,7 @@ def test_valid_signals(self): self.assertLess(signum, signal.NSIG) @unittest.skipUnless(sys.executable, "sys.executable required.") + @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") @support.requires_subprocess() def test_keyboard_interrupt_exit_code(self): """KeyboardInterrupt triggers exit via SIGINT.""" @@ -211,6 +212,7 @@ def test_issue9324(self): signal.signal(7, handler) @unittest.skipUnless(sys.executable, "sys.executable required.") + @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") @support.requires_subprocess() def test_keyboard_interrupt_exit_code(self): """KeyboardInterrupt triggers an exit using STATUS_CONTROL_C_EXIT.""" @@ -1407,6 +1409,7 @@ def cycle_handlers(): class RaiseSignalTest(unittest.TestCase): + @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") def test_sigint(self): with self.assertRaises(KeyboardInterrupt): signal.raise_signal(signal.SIGINT) @@ -1452,6 +1455,7 @@ def __del__(self): class PidfdSignalTest(unittest.TestCase): + @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") @unittest.skipUnless( hasattr(signal, "pidfd_send_signal"), "pidfd support not built in", diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 4eb5af99d6..9c7b8f6dbc 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1016,6 +1016,8 @@ def testHostnameRes(self): if not fqhn in all_host_names: self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') def test_host_resolution(self): for addr in [socket_helper.HOSTv4, '10.0.0.1', '255.255.255.255']: self.assertEqual(socket.gethostbyname(addr), addr) @@ -1161,6 +1163,8 @@ def testNtoHErrors(self): self.assertRaises(OverflowError, socket.ntohl, k) self.assertRaises(OverflowError, socket.htonl, 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. @@ -1521,6 +1525,8 @@ def test_sio_loopback_fast_path(self): raise self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + @unittest.skipUnless(os.path.exists("/etc/gai.conf"), + "getaddrinfo() will fail") def testGetaddrinfo(self): try: socket.getaddrinfo('localhost', 80) @@ -1653,6 +1659,8 @@ def test_getnameinfo(self): # only IP addresses are allowed self.assertRaises(OSError, 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/Lib/test/test_spwd.py b/Lib/test/test_spwd.py index 50766c2548..0c7eb7a83a 100644 --- a/Lib/test/test_spwd.py +++ b/Lib/test/test_spwd.py @@ -9,8 +9,7 @@ spwd = import_helper.import_module('spwd') -@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0, - 'root privileges required') +@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') class TestSpwdRoot(unittest.TestCase): def test_getspall(self): @@ -60,8 +59,7 @@ def test_getspnam(self): self.assertRaises(TypeError, spwd.getspnam, bytes_name) -@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, - 'non-root user required') +@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') class TestSpwdNonRoot(unittest.TestCase): def test_getspnam_exception(self): diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 71489ea493..33351919fe 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -2911,9 +2911,12 @@ def root_is_uid_gid_0(): 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 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 00d9e591c7..2515603715 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -1962,6 +1962,7 @@ def check_interrupt_main_noerror(self, signum): # Restore original handler signal.signal(signum, handler) + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') def test_interrupt_main_subthread(self): # Calling start_new_thread with a function that executes interrupt_main # should raise KeyboardInterrupt upon completion. @@ -1973,6 +1974,8 @@ def call_interrupt(): t.join() t.join() + + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') def test_interrupt_main_mainthread(self): # Make sure that if interrupt_main is called in main thread that # KeyboardInterrupt is raised instantly. diff --git a/Lib/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py index 0e7ed67de7..6539a2983b 100644 --- a/Lib/test/test_tools/test_freeze.py +++ b/Lib/test/test_tools/test_freeze.py @@ -23,6 +23,7 @@ 'test is too slow with PGO') class TestFreeze(unittest.TestCase): + @unittest.skipIf(True, 'Fails on Guix.') @support.requires_resource('cpu') # Building Python is slow def test_freeze_simple_script(self): script = textwrap.dedent(""" diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index 515c3840cb..a96dfad0fe 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -342,6 +342,7 @@ def test_linebreak_7643(self): self.assertEqual(len(lines), 1, r"\u%.4x should not be a linebreak" % i) +@requires_resource('network') class NormalizationTest(unittest.TestCase): @staticmethod def check_version(testfile): diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py index 445a34ae3e..8f750537c3 100644 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -69,7 +69,7 @@ def main(regrtest_args): else: args.extend(['-j', '0']) # Use all CPU cores if not any(is_resource_use_flag(arg) for arg in regrtest_args): - args.extend(['-u', 'all,-largefile,-audio,-gui']) + args.extend(['-u', 'all,-largefile,-audio,-gui,-network']) if cross_compile and hostrunner: # If HOSTRUNNER is set and -p/--python option is not given, then