#17779: test_osx_env now works with unittest test discovery. Patch by Zachary Ware.

diff --git a/Lib/test/test_osx_env.py b/Lib/test/test_osx_env.py
index 24ec2b4403daec519b58f1400b6e1fc4a7168db6..d8eb981b64da102af32d1166ff1a6b3f093fa208 100644 (file)
--- 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()

diff --git a/Misc/NEWS b/Misc/NEWS
index de1bd8865cd4bc5dc741cb46a4a836c3b930495e..341a3de45b8ccbb56837c3b07387dbc091c456f8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@ Tests
 - Issue #12820: add tests for the xml.dom.minicompat module.
   Patch by John Chandler and Phil Connell.
 
+- Issue #17779: test_osx_env now works with unittest test discovery.
+  Patch by Zachary Ware.
+
 - Issue #17766: test_iterlen now works with unittest test discovery.
   Patch by Zachary Ware.