From 5915a4dcfebf74d0a2c99848ede619f5bf7d2899 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 16 May 2008 02:24:49 +0000 Subject: [PATCH] make test_platform a bit more assertive (We'll see what the buildbots say.) --- Lib/test/test_platform.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 22307cd6567..fced4d02152 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -1,7 +1,9 @@ +import sys import unittest -from test import test_support import platform +from test import test_support + class PlatformTest(unittest.TestCase): def test_architecture(self): res = platform.architecture() @@ -49,26 +51,35 @@ class PlatformTest(unittest.TestCase): def test_uname(self): res = platform.uname() + self.assert_(any(res)) def test_java_ver(self): res = platform.java_ver() + if sys.platform == 'java': + self.assert_(all(res)) def test_win32_ver(self): res = platform.win32_ver() def test_mac_ver(self): res = platform.mac_ver() + try: + import gestalt + except ImportError: pass + else: + if sys.platform == 'darwin': + self.assert_(all(res)) def test_dist(self): res = platform.dist() def test_libc_ver(self): - from sys import executable import os - if os.path.isdir(executable) and os.path.exists(executable+'.exe'): + if os.path.isdir(sys.executable) and \ + os.path.exists(sys.executable+'.exe'): # Cygwin horror executable = executable + '.exe' - res = platform.libc_ver(executable) + res = platform.libc_ver(sys.executable) def test_main(): test_support.run_unittest(