From 33623b145df4d41f49ab3ae9e781135fb87fd98d Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Tue, 24 Nov 2015 22:12:05 +0000
Subject: [PATCH] Issue #25695: Defer creation of TESTDIRN until the test case
 is run

---
 Lib/test/test_support.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index a9ba460a2a2..f86ea918e16 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -9,13 +9,11 @@ import errno
 from test import support
 
 TESTFN = support.TESTFN
-TESTDIRN = os.path.basename(tempfile.mkdtemp(dir='.'))
 
 
 class TestSupport(unittest.TestCase):
     def setUp(self):
         support.unlink(TESTFN)
-        support.rmtree(TESTDIRN)
     tearDown = setUp
 
     def test_import_module(self):
@@ -48,6 +46,10 @@ class TestSupport(unittest.TestCase):
         support.unlink(TESTFN)
 
     def test_rmtree(self):
+        TESTDIRN = os.path.basename(tempfile.mkdtemp(dir='.'))
+        self.addCleanup(support.rmtree, TESTDIRN)
+        support.rmtree(TESTDIRN)
+
         os.mkdir(TESTDIRN)
         os.mkdir(os.path.join(TESTDIRN, TESTDIRN))
         support.rmtree(TESTDIRN)