diff options
| author | Eric Smith <eric@trueblade.com> | 2010-01-27 01:21:15 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2010-01-27 01:21:15 (GMT) |
| commit | 59529e1ef661fc2588f3436ec11909b238006116 (patch) | |
| tree | 76769293ce7f44e4a01fa9ccfe81a9c39cee66dc /Lib/test | |
| parent | 514e77e0aed005543b0d1f13a0cb8df0914e0797 (diff) | |
| download | cpython-59529e1ef661fc2588f3436ec11909b238006116.zip cpython-59529e1ef661fc2588f3436ec11909b238006116.tar.gz cpython-59529e1ef661fc2588f3436ec11909b238006116.tar.bz2 | |
Switch to test_support.get_attribute.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_sys.py | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 1e28ccf..e05b0da 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -204,29 +204,30 @@ class SysModuleTest(unittest.TestCase): sys.setrecursionlimit(oldlimit) def test_getwindowsversion(self): - if hasattr(sys, "getwindowsversion"): - v = sys.getwindowsversion() - self.assertEqual(len(v), 5) - self.assertIsInstance(v[0], int) - self.assertIsInstance(v[1], int) - self.assertIsInstance(v[2], int) - self.assertIsInstance(v[3], int) - self.assertIsInstance(v[4], str) - self.assertRaises(IndexError, operator.getitem, v, 5) - self.assertIsInstance(v.major, int) - self.assertIsInstance(v.minor, int) - self.assertIsInstance(v.build, int) - self.assertIsInstance(v.platform, int) - self.assertIsInstance(v.service_pack, str) - self.assertEqual(v[0], v.major) - self.assertEqual(v[1], v.minor) - self.assertEqual(v[2], v.build) - self.assertEqual(v[3], v.platform) - self.assertEqual(v[4], v.service_pack) - - # This is how platform.py calls it. Make sure tuple - # still has 5 elements - maj, min, buildno, plat, csd = sys.getwindowsversion() + # Raise SkipTest if sys doesn't have getwindowsversion attribute + test.test_support.get_attribute(sys, "getwindowsversion") + v = sys.getwindowsversion() + self.assertEqual(len(v), 5) + self.assertIsInstance(v[0], int) + self.assertIsInstance(v[1], int) + self.assertIsInstance(v[2], int) + self.assertIsInstance(v[3], int) + self.assertIsInstance(v[4], str) + self.assertRaises(IndexError, operator.getitem, v, 5) + self.assertIsInstance(v.major, int) + self.assertIsInstance(v.minor, int) + self.assertIsInstance(v.build, int) + self.assertIsInstance(v.platform, int) + self.assertIsInstance(v.service_pack, str) + self.assertEqual(v[0], v.major) + self.assertEqual(v[1], v.minor) + self.assertEqual(v[2], v.build) + self.assertEqual(v[3], v.platform) + self.assertEqual(v[4], v.service_pack) + + # This is how platform.py calls it. Make sure tuple + # still has 5 elements + maj, min, buildno, plat, csd = sys.getwindowsversion() def test_dlopenflags(self): if hasattr(sys, "setdlopenflags"): |