diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-12-14 01:25:30 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-12-14 01:25:30 (GMT) |
| commit | f3d082c9606c163a904ad3fb5a0bd48880a5561e (patch) | |
| tree | 6e799296dedd81e28dafd06e6e6643f143ceb8ce /Lib/test/test_time.py | |
| parent | ccb9d05b6c6b32ac9429f90cf24a1da477fde79e (diff) | |
| download | cpython-f3d082c9606c163a904ad3fb5a0bd48880a5561e.zip cpython-f3d082c9606c163a904ad3fb5a0bd48880a5561e.tar.gz cpython-f3d082c9606c163a904ad3fb5a0bd48880a5561e.tar.bz2 | |
Merged revisions 87222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87222 | r.david.murray | 2010-12-13 20:22:50 -0500 (Mon, 13 Dec 2010) | 2 lines
Use skipIf instead of a return when attribute doesn't exist.
........
Diffstat (limited to 'Lib/test/test_time.py')
| -rw-r--r-- | Lib/test/test_time.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 4b5d703..eb4289f 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -125,9 +125,9 @@ class TimeTestCase(unittest.TestCase): time.asctime(time.gmtime(self.t)) self.assertRaises(TypeError, time.asctime, 0) + @unittest.skipIf(not hasattr(time, "tzset"), + "time module has no attribute tzset") def test_tzset(self): - if not hasattr(time, "tzset"): - return # Can't test this; don't want the test suite to fail from os import environ |