]> granicus.if.org Git - python/commitdiff
bpo-35661: Fix failing test on buildbot (GH-12297)
authorCheryl Sabella <cheryl.sabella@gmail.com>
Wed, 13 Mar 2019 00:15:47 +0000 (20:15 -0400)
committerGitHub <noreply@github.com>
Wed, 13 Mar 2019 00:15:47 +0000 (20:15 -0400)
Lib/test/test_venv.py

index 1ddec72927fa959e6dabddc07e6efe07c457a472..0b2c7a0258df1614f2373d31707baed8ed0a2caf 100644 (file)
@@ -110,18 +110,20 @@ class BasicTest(BaseTest):
     def test_prompt(self):
         env_name = os.path.split(self.env_dir)[1]
 
+        rmtree(self.env_dir)
         builder = venv.EnvBuilder()
+        self.run_with_capture(builder.create, self.env_dir)
         context = builder.ensure_directories(self.env_dir)
-        self.assertEqual(context.prompt, '(%s) ' % env_name)
-        builder.create(self.env_dir)
         data = self.get_text_file_contents('pyvenv.cfg')
+        self.assertEqual(context.prompt, '(%s) ' % env_name)
         self.assertNotIn("prompt = ", data)
 
+        rmtree(self.env_dir)
         builder = venv.EnvBuilder(prompt='My prompt')
+        self.run_with_capture(builder.create, self.env_dir)
         context = builder.ensure_directories(self.env_dir)
-        self.assertEqual(context.prompt, '(My prompt) ')
-        builder.create(self.env_dir)
         data = self.get_text_file_contents('pyvenv.cfg')
+        self.assertEqual(context.prompt, '(My prompt) ')
         self.assertIn("prompt = 'My prompt'\n", data)
 
     @skipInVenv