summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-07-23 11:51:28 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-07-23 11:51:28 (GMT)
commit87597749d5d5567688454ae827d70a0ea6e3677c (patch)
tree6de15220779292612a14f382d6f73fb78db80ad3
parentd7eb3a8d734f9e5269f3a9bc4d53d967fa1908bb (diff)
downloadcpython-87597749d5d5567688454ae827d70a0ea6e3677c.zip
cpython-87597749d5d5567688454ae827d70a0ea6e3677c.tar.gz
cpython-87597749d5d5567688454ae827d70a0ea6e3677c.tar.bz2
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. ........
-rw-r--r--Lib/test/test_osx_env.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_osx_env.py b/Lib/test/test_osx_env.py
index 10fe020..8b3df37 100644
--- 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)]