From 047b7ae56628717160eb75e379e2bfdaa59dfc18 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 5 Oct 2014 17:37:41 +0200 Subject: [PATCH 1/2] Issue #22390: Remove files created by tests --- Lib/test/test_imp.py | 1 + Lib/test/test_import.py | 1 + Lib/test/test_pdb.py | 1 + Lib/test/test_posix.py | 2 +- Lib/test/test_source_encoding.py | 3 ++- Lib/test/test_support.py | 1 + Lib/test/test_threaded_import.py | 4 +++- 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index 024f43894b2..80b9ec38c5d 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -198,6 +198,7 @@ class ImportTests(unittest.TestCase): support.unlink(temp_mod_name + ext) support.unlink(init_file_name + ext) support.rmtree(test_package_name) + support.rmtree('__pycache__') def test_issue9319(self): path = os.path.dirname(__file__) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 781a159193a..b4842c54b56 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -1062,6 +1062,7 @@ class ImportTracebackTests(unittest.TestCase): # Issue #11619: The Python parser and the import machinery must not # encode filenames, especially on Windows pyname = script_helper.make_script('', TESTFN_UNENCODABLE, 'pass') + self.addCleanup(unlink, pyname) name = pyname[:-3] script_helper.assert_python_ok("-c", "mod = __import__(%a)" % name, __isolated=False) diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 895be02c919..edc9e75438c 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -916,6 +916,7 @@ class PdbTestCase(unittest.TestCase): with open(filename, 'w') as f: f.write(textwrap.dedent(script)) self.addCleanup(support.unlink, filename) + self.addCleanup(support.rmtree, '__pycache__') cmd = [sys.executable, '-m', 'pdb', filename] stdout = stderr = None with subprocess.Popen(cmd, stdout=subprocess.PIPE, diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 3fae2b187cb..a269db4b327 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1125,7 +1125,7 @@ class PosixTester(unittest.TestCase): """ Test functions that call path_error2(), providing two filenames in their exceptions. """ - for name in ("rename", "replace", "link", "symlink"): + for name in ("rename", "replace", "link"): function = getattr(os, name, None) if function: diff --git a/Lib/test/test_source_encoding.py b/Lib/test/test_source_encoding.py index 0c41e50662a..39a7c56019b 100644 --- a/Lib/test/test_source_encoding.py +++ b/Lib/test/test_source_encoding.py @@ -1,7 +1,7 @@ # -*- coding: koi8-r -*- import unittest -from test.support import TESTFN, unlink, unload +from test.support import TESTFN, unlink, unload, rmtree import importlib import os import sys @@ -129,6 +129,7 @@ class SourceEncodingTest(unittest.TestCase): unlink(filename + "c") unlink(filename + "o") unload(TESTFN) + rmtree('__pycache__') def test_error_from_string(self): # See http://bugs.python.org/issue6289 diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 9bd0a01948e..03ce9d19316 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -69,6 +69,7 @@ class TestSupport(unittest.TestCase): finally: del sys.path[0] support.unlink(mod_filename) + support.rmtree('__pycache__') def test_HOST(self): s = socket.socket() diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py index c7bfea07a1e..192fa08a265 100644 --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -13,7 +13,8 @@ import time import shutil import unittest from test.support import ( - verbose, import_module, run_unittest, TESTFN, reap_threads, forget, unlink) + verbose, import_module, run_unittest, TESTFN, reap_threads, + forget, unlink, rmtree) threading = import_module('threading') def task(N, done, done_tasks, errors): @@ -222,6 +223,7 @@ class ThreadedImportTests(unittest.TestCase): f.write(code.encode('utf-8')) self.addCleanup(unlink, filename) self.addCleanup(forget, TESTFN) + self.addCleanup(rmtree, '__pycache__') importlib.invalidate_caches() __import__(TESTFN) From bed04a77ee4dde8e1ab7b00557519f01cac734aa Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 5 Oct 2014 17:37:59 +0200 Subject: [PATCH 2/2] cleanup test_posix --- Lib/test/test_posix.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index a269db4b327..72fdd16f8d4 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1127,16 +1127,17 @@ class PosixTester(unittest.TestCase): """ for name in ("rename", "replace", "link"): function = getattr(os, name, None) + if function is None: + continue - if function: - for dst in ("noodly2", support.TESTFN): - try: - function('doesnotexistfilename', dst) - except OSError as e: - self.assertIn("'doesnotexistfilename' -> '{}'".format(dst), str(e)) - break - else: - self.fail("No valid path_error2() test for os." + name) + for dst in ("noodly2", support.TESTFN): + try: + function('doesnotexistfilename', dst) + except OSError as e: + self.assertIn("'doesnotexistfilename' -> '{}'".format(dst), str(e)) + break + else: + self.fail("No valid path_error2() test for os." + name) class PosixGroupsTester(unittest.TestCase):