From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 26 Sep 2018 16:09:32 +0000 (-0700)
Subject: bpo-28655: Fix test_import.test_missing_source_legacy() (GH-9589)
X-Git-Tag: v3.6.7rc2~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43500a5907eb9ae2e470dcbffe73012cd456f5a1;p=thirdparty%2FPython%2Fcpython.git

bpo-28655: Fix test_import.test_missing_source_legacy() (GH-9589)

bpo-28655, bpo-33053: test_import.test_missing_source_legacy() now
removes the .pyc file that it creates to avoid leaking a file.

Fix extract from commit d5d9e02dd3c6df06a8dd9ce75ee9b52976420a8b.

Co-Authored-By: Nick Coghlan <ncoghlan@gmail.com>
---

diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index b73a96f75700..6fb7cb0669cc 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -779,8 +779,11 @@ class PycacheTests(unittest.TestCase):
         unload(TESTFN)
         importlib.invalidate_caches()
         m = __import__(TESTFN)
-        self.assertEqual(m.__file__,
-                         os.path.join(os.curdir, os.path.relpath(pyc_file)))
+        try:
+            self.assertEqual(m.__file__,
+                             os.path.join(os.curdir, os.path.relpath(pyc_file)))
+        finally:
+            os.remove(pyc_file)
 
     def test___cached__(self):
         # Modules now also have an __cached__ that points to the pyc file.