diff options
Diffstat (limited to 'Lib/test')
| -rwxr-xr-x | Lib/test/regrtest.py | 37 | ||||
| -rw-r--r-- | Lib/test/test_frozen.py | 13 | ||||
| -rw-r--r-- | Lib/test/test_repr.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_select.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_strptime.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_tempfile.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_urllib2.py | 4 |
8 files changed, 15 insertions, 62 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 545e0ea..a4139d3 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1156,41 +1156,6 @@ _expectations = { test_kqueue test_ossaudiodev """, - 'mac': - """ - test_atexit - test_bsddb - test_bsddb185 - test_bsddb3 - test_bz2 - test_commands - test_crypt - test_curses - test_dbm - test_dl - test_fcntl - test_fork1 - test_epoll - test_grp - test_ioctl - test_largefile - test_locale - test_kqueue - test_mmap - test_openpty - test_ossaudiodev - test_poll - test_popen - test_popen2 - test_posix - test_pty - test_pwd - test_resource - test_signal - test_sundry - test_tarfile - test_timing - """, 'unixware7': """ test_bsddb @@ -1477,7 +1442,7 @@ class _ExpectedSkips: if sys.maxint == 9223372036854775807L: self.expected.add('test_imageop') - if not sys.platform in ("mac", "darwin"): + if sys.platform != "darwin": MAC_ONLY = ["test_macos", "test_macostools", "test_aepack", "test_plistlib", "test_scriptpackages", "test_applesingle"] diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py index 5f72a92..7fb53a4 100644 --- a/Lib/test/test_frozen.py +++ b/Lib/test/test_frozen.py @@ -23,13 +23,12 @@ class FrozenTests(unittest.TestCase): except ImportError, x: self.fail("import __phello__.spam failed:" + str(x)) - if sys.platform != "mac": # On the Mac this import does succeed. - try: - import __phello__.foo - except ImportError: - pass - else: - self.fail("import __phello__.foo should have failed") + try: + import __phello__.foo + except ImportError: + pass + else: + self.fail("import __phello__.foo should have failed") self.assertEquals(stdout.getvalue(), 'Hello world...\nHello world...\nHello world...\n') diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py index 26300d3..a8202ee 100644 --- a/Lib/test/test_repr.py +++ b/Lib/test/test_repr.py @@ -320,8 +320,7 @@ class ClassWithFailingRepr: def test_main(): run_unittest(ReprTests) - if os.name != 'mac': - run_unittest(LongReprTest) + run_unittest(LongReprTest) if __name__ == "__main__": diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py index 647d71e..79b249b 100644 --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -4,7 +4,7 @@ import select import os import sys -@unittest.skipIf(sys.platform[:3] in ('win', 'mac', 'os2', 'riscos'), +@unittest.skipIf(sys.platform[:3] in ('win', 'os2', 'riscos'), "can't easily test on this system") class SelectTestCase(unittest.TestCase): diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 0ce329f..430a647 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1383,9 +1383,8 @@ class TIPCThreadableTest (unittest.TestCase, ThreadableTest): def test_main(): tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest, - TestExceptions, BufferIOTest, BasicTCPTest2] - if sys.platform != 'mac': - tests.extend([ BasicUDPTest, UDPTimeoutTest ]) + TestExceptions, BufferIOTest, BasicTCPTest2, BasicUDPTest, + UDPTimeoutTest ] tests.extend([ NonBlockingTCPTests, diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index d2868e9..a233b1c 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -298,9 +298,6 @@ class StrptimeTests(unittest.TestCase): self.assertEqual(strp_output.tm_isdst, 0) strp_output = _strptime._strptime_time("GMT", "%Z") self.assertEqual(strp_output.tm_isdst, 0) - if sys.platform == "mac": - # Timezones don't really work on MacOS9 - return time_tuple = time.localtime() strf_output = time.strftime("%Z") #UTC does not have a timezone strp_output = _strptime._strptime_time(strf_output, "%Z") @@ -317,8 +314,6 @@ class StrptimeTests(unittest.TestCase): def test_bad_timezone(self): # Explicitly test possibility of bad timezone; # when time.tzname[0] == time.tzname[1] and time.daylight - if sys.platform == "mac": - return #MacOS9 has severely broken timezone support. tz_name = time.tzname[0] if tz_name.upper() in ("UTC", "GMT"): return diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index e534d62..27068e3 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -23,9 +23,7 @@ has_spawnl = hasattr(os, 'spawnl') # TEST_FILES may need to be tweaked for systems depending on the maximum # number of files that can be opened at one time (see ulimit -n) -if sys.platform == 'mac': - TEST_FILES = 32 -elif sys.platform in ('openbsd3', 'openbsd4'): +if sys.platform in ('openbsd3', 'openbsd4'): TEST_FILES = 48 else: TEST_FILES = 100 @@ -257,7 +255,7 @@ class test__mkstemp_inner(TC): file = self.do_create() mode = stat.S_IMODE(os.stat(file.name).st_mode) expected = 0600 - if sys.platform in ('win32', 'os2emx', 'mac'): + if sys.platform in ('win32', 'os2emx'): # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 @@ -476,7 +474,7 @@ class test_mkdtemp(TC): mode = stat.S_IMODE(os.stat(dir).st_mode) mode &= 0777 # Mask off sticky bits inherited from /tmp expected = 0700 - if sys.platform in ('win32', 'os2emx', 'mac'): + if sys.platform in ('win32', 'os2emx'): # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index c0366dd..01a06fb 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -24,9 +24,7 @@ class TrivialTests(unittest.TestCase): # And more hacking to get it to work on MacOS. This assumes # urllib.pathname2url works, unfortunately... - if os.name == 'mac': - fname = '/' + fname.replace(':', '/') - elif os.name == 'riscos': + if os.name == 'riscos': import string fname = os.expand(fname) fname = fname.translate(string.maketrans("/.", "./")) |