From: Cheryl Sabella <cheryl.sabella@gmail.com>
Date: Wed, 13 Mar 2019 00:15:47 +0000 (-0400)
Subject: bpo-35661: Fix failing test on buildbot (GH-12297)
X-Git-Tag: v3.8.0a3~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839b925f6347222de560cdb767924c502b4039aa;p=thirdparty%2FPython%2Fcpython.git

bpo-35661: Fix failing test on buildbot (GH-12297)
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 1ddec72927fa..0b2c7a0258df 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -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