summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-19 02:38:48 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-19 02:38:48 (GMT)
commita108112680db1576a71d9218cf052437b16868b6 (patch)
tree536ba35f47998d07b815ec3eff4e2d77bef27fec /Lib
parentf7520dc0d7b4965f2c23a734ab48d472553d3b06 (diff)
parentaaa5d1c5821b67dd9e3d33011d345b8839793254 (diff)
downloadcpython-a108112680db1576a71d9218cf052437b16868b6.zip
cpython-a108112680db1576a71d9218cf052437b16868b6.tar.gz
cpython-a108112680db1576a71d9218cf052437b16868b6.tar.bz2
#17779: merge with 3.3.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_osx_env.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_osx_env.py b/Lib/test/test_osx_env.py
index 24ec2b4..d8eb981 100644
--- a/Lib/test/test_osx_env.py
+++ b/Lib/test/test_osx_env.py
@@ -8,6 +8,9 @@ import sys
import sysconfig
import unittest
+@unittest.skipUnless(sys.platform == 'darwin' and
+ sysconfig.get_config_var('WITH_NEXT_FRAMEWORK'),
+ 'unnecessary on this platform')
class OSXEnvironmentVariableTestCase(unittest.TestCase):
def _check_sys(self, ev, cond, sv, val = sys.executable + 'dummy'):
with EnvironmentVarGuard() as evg:
@@ -27,9 +30,5 @@ class OSXEnvironmentVariableTestCase(unittest.TestCase):
def test_pythonexecutable_sets_sys_executable(self):
self._check_sys('PYTHONEXECUTABLE', '==', 'sys.executable')
-def test_main():
- if sys.platform == 'darwin' and sysconfig.get_config_var('WITH_NEXT_FRAMEWORK'):
- run_unittest(OSXEnvironmentVariableTestCase)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()