[Python-checkins] cpython: Restore test that was using pysetup and can now (#15157) use pydoc
eric.araujo
python-checkins at python.org
Sun Jun 24 19:54:28 CEST 2012
http://hg.python.org/cpython/rev/9cf4dc975a32
changeset: 77731:9cf4dc975a32
parent: 77728:f12a2f2c93e5
user: Éric Araujo <merwok at netwok.org>
date: Sun Jun 24 13:51:22 2012 -0400
summary:
Restore test that was using pysetup and can now (#15157) use pydoc
files:
Lib/test/test_venv.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -21,10 +21,12 @@
self.env_dir = tempfile.mkdtemp()
if os.name == 'nt':
self.bindir = 'Scripts'
+ self.pydocname = 'pydoc.py'
self.lib = ('Lib',)
self.include = 'Include'
else:
self.bindir = 'bin'
+ self.pydocname = 'pydoc'
self.lib = ('lib', 'python%s' % sys.version[:3])
self.include = 'include'
if sys.platform == 'darwin' and '__PYTHONV_LAUNCHER__' in os.environ:
@@ -74,6 +76,8 @@
executable = sys.executable
path = os.path.dirname(executable)
self.assertIn('home = %s' % path, data)
+ data = self.get_text_file_contents(self.bindir, self.pydocname)
+ self.assertTrue(data.startswith('#!%s%s' % (self.env_dir, os.sep)))
fn = self.get_env_file(self.bindir, self.exe)
if not os.path.exists(fn): # diagnostics for Windows buildbot failures
bd = self.get_env_file(self.bindir)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list