diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2018-01-22 17:32:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 17:32:50 (GMT) |
commit | 13ff24582c99dfb439b1af7295b401415e7eb05b (patch) | |
tree | 6966d9e1247134dfee9db73b6b5a215bfa88baf4 /Lib | |
parent | b0a7a037b8fde56b62f886d5188bced7776777b4 (diff) | |
download | cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.zip cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.tar.gz cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.tar.bz2 |
bpo-32593: Drop FreeBSD 9 and older support (#5232)
Drop support of FreeBSD 9 and older.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_asyncio/test_events.py | 2 | ||||
-rw-r--r-- | Lib/test/test_io.py | 2 | ||||
-rw-r--r-- | Lib/test/test_logging.py | 9 | ||||
-rw-r--r-- | Lib/test/test_os.py | 4 | ||||
-rw-r--r-- | Lib/test/test_posix.py | 1 | ||||
-rw-r--r-- | Lib/test/test_resource.py | 1 | ||||
-rw-r--r-- | Lib/test/test_signal.py | 21 | ||||
-rw-r--r-- | Lib/test/test_socket.py | 4 | ||||
-rw-r--r-- | Lib/test/test_threading.py | 3 | ||||
-rw-r--r-- | Lib/unittest/test/test_break.py | 8 |
10 files changed, 5 insertions, 50 deletions
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 4140f03..e4b0536 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -1471,8 +1471,6 @@ class EventLoopTestsMixin: @unittest.skipUnless(sys.platform != 'win32', "Don't support pipes for Windows") @unittest.skipIf(sys.platform == 'darwin', 'test hangs on MacOS') - # Issue #20495: The test hangs on FreeBSD 7.2 but pass on FreeBSD 9 - @support.requires_freebsd_version(8) def test_read_pty_output(self): proto = MyReadPipeProto(loop=self.loop) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 3aee5f1..c6345e9 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -4107,8 +4107,6 @@ class SignalsTest(unittest.TestCase): def test_interrupted_write_buffered(self): self.check_interrupted_write(b"xy", b"xy", mode="wb") - # Issue #22331: The test hangs on FreeBSD 7.2 - @support.requires_freebsd_version(8) def test_interrupted_write_text(self): self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii") diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 54049d2..eee2ed0 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -773,14 +773,7 @@ class TestSMTPServer(smtpd.SMTPServer): :func:`select` or :func:`poll` call by :func:`asyncore.loop`. """ - try: - asyncore.loop(poll_interval, map=self._map) - except OSError: - # On FreeBSD 8, closing the server repeatably - # raises this error. We swallow it if the - # server has been closed. - if self.connected or self.accepting: - raise + asyncore.loop(poll_interval, map=self._map) def stop(self, timeout=None): """ diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 83e214d..02611d2 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -782,9 +782,7 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol): value_str = value.decode(sys.getfilesystemencoding(), 'surrogateescape') self.assertEqual(os.environ['bytes'], value_str) - # On FreeBSD < 7 and OS X < 10.6, unsetenv() doesn't return a value (issue - # #13415). - @support.requires_freebsd_version(7) + # On OS X < 10.6, unsetenv() doesn't return a value (bpo-13415). @support.requires_mac_ver(10, 6) def test_unset_error(self): if sys.platform == "win32": diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 44b8d6a..6c50406 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -559,6 +559,7 @@ class PosixTester(unittest.TestCase): self.assertRaises(TypeError, posix.minor) self.assertRaises((ValueError, OverflowError), posix.minor, -1) + # FIXME: reenable these tests on FreeBSD with the kernel fix if sys.platform.startswith('freebsd') and dev >= 0x1_0000_0000: self.skipTest("bpo-31044: on FreeBSD CURRENT, minor() truncates " "64-bit dev to 32-bit") diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index cc9c570..4b85278 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -138,7 +138,6 @@ class ResourceTest(unittest.TestCase): with contextlib.suppress(AttributeError): self.assertIsInstance(getattr(resource, 'RLIMIT_' + attr), int) - @support.requires_freebsd_version(9) def test_freebsd_contants(self): for attr in ['SWAP', 'SBSIZE', 'NPTS']: with contextlib.suppress(AttributeError): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index f17123c..48b7a39 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -56,9 +56,6 @@ class PosixTests(unittest.TestCase): self.assertEqual(signal.getsignal(signal.SIGHUP), hup) # Issue 3864, unknown if this affects earlier versions of freebsd also - @unittest.skipIf(sys.platform=='freebsd6', - 'inter process signals not reliable (do not mix well with threading) ' - 'on freebsd6') def test_interprocess_signal(self): dirname = os.path.dirname(__file__) script = os.path.join(dirname, 'signalinterproctester.py') @@ -651,7 +648,7 @@ class ItimerTest(unittest.TestCase): self.assertEqual(self.hndl_called, True) # Issue 3864, unknown if this affects earlier versions of freebsd also - @unittest.skipIf(sys.platform in ('freebsd6', 'netbsd5'), + @unittest.skipIf(sys.platform in ('netbsd5',), 'itimer not reliable (does not mix well with threading) on some BSDs.') def test_itimer_virtual(self): self.itimer = signal.ITIMER_VIRTUAL @@ -673,9 +670,6 @@ class ItimerTest(unittest.TestCase): # and the handler should have been called self.assertEqual(self.hndl_called, True) - # Issue 3864, unknown if this affects earlier versions of freebsd also - @unittest.skipIf(sys.platform=='freebsd6', - 'itimer not reliable (does not mix well with threading) on freebsd6') def test_itimer_prof(self): self.itimer = signal.ITIMER_PROF signal.signal(signal.SIGPROF, self.sig_prof) @@ -762,16 +756,6 @@ class PendingSignalsTests(unittest.TestCase): signal.signal(signum, handler) - if sys.platform == 'freebsd6': - # Issue #12392 and #12469: send a signal to the main thread - # doesn't work before the creation of the first thread on - # FreeBSD 6 - def noop(): - pass - thread = threading.Thread(target=noop) - thread.start() - thread.join() - tid = threading.get_ident() try: signal.pthread_kill(tid, signum) @@ -1010,9 +994,6 @@ class PendingSignalsTests(unittest.TestCase): """ assert_python_ok('-c', code) - @unittest.skipIf(sys.platform == 'freebsd6', - "issue #12392: send a signal to the main thread doesn't work " - "before the creation of the first thread on FreeBSD 6") @unittest.skipUnless(hasattr(signal, 'pthread_kill'), 'need signal.pthread_kill()') def test_pthread_kill_main_thread(self): diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 43688ea..22d142c 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -2598,9 +2598,6 @@ class RecvmsgGenericTests(SendrecvmsgBase): def _testRecvmsgShorter(self): self.sendToServer(MSG) - # FreeBSD < 8 doesn't always set the MSG_TRUNC flag when a truncated - # datagram is received (issue #13001). - @support.requires_freebsd_version(8) def testRecvmsgTrunc(self): # Receive part of message, check for truncation indicators. msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, @@ -2610,7 +2607,6 @@ class RecvmsgGenericTests(SendrecvmsgBase): self.assertEqual(ancdata, []) self.checkFlags(flags, eor=False) - @support.requires_freebsd_version(8) def _testRecvmsgTrunc(self): self.sendToServer(MSG) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 007581d..db70dfa 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -25,8 +25,7 @@ from test import support # #12316 and #11870), and fork() from a worker thread is known to trigger # problems with some operating systems (issue #3863): skip problematic tests # on platforms known to behave badly. -platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', - 'hp-ux11') +platforms_to_skip = ('netbsd5', 'hp-ux11') # A trivial mutable counter. diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py index 2c75019..aa2c69e 100644 --- a/Lib/unittest/test/test_break.py +++ b/Lib/unittest/test/test_break.py @@ -10,8 +10,6 @@ import unittest @unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") @unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") -@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " - "if threads have been used") class TestBreak(unittest.TestCase): int_handler = None @@ -267,22 +265,16 @@ class TestBreak(unittest.TestCase): @unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") @unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") -@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " - "if threads have been used") class TestBreakDefaultIntHandler(TestBreak): int_handler = signal.default_int_handler @unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") @unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") -@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " - "if threads have been used") class TestBreakSignalIgnored(TestBreak): int_handler = signal.SIG_IGN @unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") @unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") -@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " - "if threads have been used") class TestBreakSignalDefault(TestBreak): int_handler = signal.SIG_DFL |