Commit 37861207 authored by Vinay Sajip's avatar Vinay Sajip

Issue #18224: Updated test.

parent b4bc5c4e
...@@ -23,12 +23,10 @@ class BaseTest(unittest.TestCase): ...@@ -23,12 +23,10 @@ class BaseTest(unittest.TestCase):
self.env_dir = os.path.realpath(tempfile.mkdtemp()) self.env_dir = os.path.realpath(tempfile.mkdtemp())
if os.name == 'nt': if os.name == 'nt':
self.bindir = 'Scripts' self.bindir = 'Scripts'
self.pydocname = 'pydoc.py'
self.lib = ('Lib',) self.lib = ('Lib',)
self.include = 'Include' self.include = 'Include'
else: else:
self.bindir = 'bin' self.bindir = 'bin'
self.pydocname = 'pydoc'
self.lib = ('lib', 'python%s' % sys.version[:3]) self.lib = ('lib', 'python%s' % sys.version[:3])
self.include = 'include' self.include = 'include'
if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in os.environ: if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in os.environ:
...@@ -78,8 +76,6 @@ class BasicTest(BaseTest): ...@@ -78,8 +76,6 @@ class BasicTest(BaseTest):
executable = sys.executable executable = sys.executable
path = os.path.dirname(executable) path = os.path.dirname(executable)
self.assertIn('home = %s' % path, data) 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) fn = self.get_env_file(self.bindir, self.exe)
if not os.path.exists(fn): # diagnostics for Windows buildbot failures if not os.path.exists(fn): # diagnostics for Windows buildbot failures
bd = self.get_env_file(self.bindir) bd = self.get_env_file(self.bindir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment