(original) (raw)

changeset: 83446:4ea9a8e5ec21 parent: 83444:1c2089c58a37 parent: 83445:f5d31084fbbd user: Ezio Melotti ezio.melotti@gmail.com date: Fri Apr 19 05:38:48 2013 +0300 files: Misc/NEWS description: #17779: merge with 3.3. diff -r 1c2089c58a37 -r 4ea9a8e5ec21 Lib/test/test_osx_env.py --- a/Lib/test/test_osx_env.py Fri Apr 19 04:23:09 2013 +0300 +++ b/Lib/test/test_osx_env.py Fri Apr 19 05:38:48 2013 +0300 @@ -8,6 +8,9 @@ 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 @@ 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 -r 1c2089c58a37 -r 4ea9a8e5ec21 Misc/NEWS --- a/Misc/NEWS Fri Apr 19 04:23:09 2013 +0300 +++ b/Misc/NEWS Fri Apr 19 05:38:48 2013 +0300 @@ -134,6 +134,9 @@ - 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. /ezio.melotti@gmail.com