Merged revisions 83073 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83073 | ronald.oussoren | 2010-07-23 12:48:36 +0100 (Fri, 23 Jul 2010) | 4 lines

  Minor tweak of test_osx_env to
  avoid failing when the framework is not
  yet installed.
........

diff --git a/Lib/test/test_osx_env.py b/Lib/test/test_osx_env.py
index 10fe02072539f42bafed40a0bf4b723169ca6b06..8b3df3783bd251c423d8fdfdaeafa89312f0a73c 100644 (file)
--- a/Lib/test/test_osx_env.py
+++ b/Lib/test/test_osx_env.py
@@ -8,7 +8,7 @@ import sys
 import unittest
 
 class OSXEnvironmentVariableTestCase(unittest.TestCase):
-    def _check_sys(self, ev, cond, sv, val = '/some/path/to/python'):
+    def _check_sys(self, ev, cond, sv, val = sys.executable + 'dummy'):
         with EnvironmentVarGuard() as evg:
             subpc = [str(sys.executable), '-c',
                 'import sys; sys.exit(2 if "%s" %s %s else 3)' % (val, cond, sv)]