diff options
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_signal.py | 4 | ||||
-rw-r--r-- | Lib/test/test_socket.py | 6 | ||||
-rw-r--r-- | Lib/test/test_threading.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index d35d7c46c9..a7038177be 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -438,8 +438,8 @@ 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=='freebsd6', - 'itimer not reliable (does not mix well with threading) on freebsd6') + @unittest.skipIf(sys.platform in ('freebsd6', 'netbsd5'), + 'itimer not reliable (does not mix well with threading) on some BSDs.') def test_itimer_virtual(self): self.itimer = signal.ITIMER_VIRTUAL signal.signal(signal.SIGVTALRM, self.sig_vtalrm) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 37756b145d..20076e4567 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -351,8 +351,10 @@ class GeneralModuleTests(unittest.TestCase): # Find one service that exists, then check all the related interfaces. # I've ordered this by protocols that have both a tcp and udp # protocol, at least for modern Linuxes. - if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', - 'freebsd7', 'freebsd8', 'darwin'): + if (sys.platform.startswith('linux') or + sys.platform.startswith('freebsd') or + sys.platform.startswith('netbsd') or + sys.platform == 'darwin'): # avoid the 'echo' service on this platform, as there is an # assumption breaking non-standard port/protocol entry services = ('daytime', 'qotd', 'domain') diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index d97b062900..5af74794c2 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -471,7 +471,8 @@ class ThreadJoinOnShutdown(BaseTestCase): return # Skip platforms with known problems forking from a worker thread. # See http://bugs.python.org/issue3863. - if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'): + if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', + 'os2emx'): print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' ' due to known OS bugs on'), sys.platform return |