diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-07-31 15:58:46 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-07-31 15:58:46 (GMT) |
| commit | 548c054fb70c504150ec8bafa4503d6b4e74e535 (patch) | |
| tree | f5c798beb4a7ee50e4813e009e0df00f433142d1 | |
| parent | ab7c1b3f1137f7479aa3c1aee82a353ee214cfe5 (diff) | |
| download | cpython-548c054fb70c504150ec8bafa4503d6b4e74e535.zip cpython-548c054fb70c504150ec8bafa4503d6b4e74e535.tar.gz cpython-548c054fb70c504150ec8bafa4503d6b4e74e535.tar.bz2 | |
Stop trying to write into the stdlib during lib2to3 tests (#12331).
This prevents tests from failing when run from a Python installed in a
read-only directory.
| -rw-r--r-- | Lib/lib2to3/tests/test_refactor.py | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 73122d8..54edeb4 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -177,22 +177,26 @@ from __future__ import print_function""" self.assertEqual(results, expected) def check_file_refactoring(self, test_file, fixers=_2TO3_FIXERS): + tmpdir = tempfile.mkdtemp(prefix="2to3-test_refactor") + self.addCleanup(shutil.rmtree, tmpdir) + # make a copy of the tested file that we can write to + shutil.copy(test_file, tmpdir) + test_file = os.path.join(tmpdir, os.path.basename(test_file)) + os.chmod(test_file, 0o644) + def read_file(): with open(test_file, "rb") as fp: return fp.read() + old_contents = read_file() rt = self.rt(fixers=fixers) rt.refactor_file(test_file) self.assertEqual(old_contents, read_file()) - try: - rt.refactor_file(test_file, True) - new_contents = read_file() - self.assertNotEqual(old_contents, new_contents) - finally: - with open(test_file, "wb") as fp: - fp.write(old_contents) + rt.refactor_file(test_file, True) + new_contents = read_file() + self.assertNotEqual(old_contents, new_contents) return new_contents def test_refactor_file(self): @@ -140,6 +140,9 @@ Tools/Demos Tests ----- +- Issue #12331: The test suite for lib2to3 can now run from an installed + Python. + - Issue #12626: In regrtest, allow to filter tests using a glob filter with the ``-m`` (or ``--match``) option. This works with all test cases using the unittest module. This is useful with long test suites |