diff options
| -rw-r--r-- | Lib/test/test_linecache.py | 68 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 36 insertions, 36 deletions
diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py index 14d8d59..4899511 100644 --- a/Lib/test/test_linecache.py +++ b/Lib/test/test_linecache.py @@ -83,44 +83,40 @@ class LineCacheTests(unittest.TestCase): getline = linecache.getline try: # Create a source file and cache its contents - source_name = os.path.join(TEST_PATH, 'linecache_test.py') - source = open(source_name, 'w') - source.write(SOURCE_1) - source.close() - getline(source_name, 1) - - # Keep a copy of the old contents - source_list = [] - source = open(source_name) - for index, line in enumerate(source): - self.assertEquals(line, getline(source_name, index + 1)) - source_list.append(line) - source.close() - - source = open(source_name, 'w') - source.write(SOURCE_2) - source.close() - - # Try to update a bogus cache entry - linecache.checkcache('dummy') - - # Check that the cache matches the old contents - for index, line in enumerate(source_list): - self.assertEquals(line, getline(source_name, index + 1)) - - # Update the cache and check whether it matches the new source file - linecache.checkcache(source_name) - source = open(source_name) - for index, line in enumerate(source): - self.assertEquals(line, getline(source_name, index + 1)) - source_list.append(line) - source.close() + source_name = support.TESTFN + '.py' + with open(source_name, 'w') as source: + source.write(SOURCE_1) + source.close() + getline(source_name, 1) + + # Keep a copy of the old contents + source_list = [] + source = open(source_name) + for index, line in enumerate(source): + self.assertEquals(line, getline(source_name, index + 1)) + source_list.append(line) + source.close() - finally: - try: + source = open(source_name, 'w') + source.write(SOURCE_2) source.close() - finally: - support.unlink(source_name) + + # Try to update a bogus cache entry + linecache.checkcache('dummy') + + # Check that the cache matches the old contents + for index, line in enumerate(source_list): + self.assertEquals(line, getline(source_name, index + 1)) + + # Update the cache and check whether it matches the new source file + linecache.checkcache(source_name) + source = open(source_name) + for index, line in enumerate(source): + self.assertEquals(line, getline(source_name, index + 1)) + source_list.append(line) + + finally: + support.unlink(source_name) def test_main(): support.run_unittest(LineCacheTests) @@ -192,6 +192,10 @@ Extension Modules Tests ----- +- Issue #7431: use TESTFN in test_linecache instead of trying to create a + file in the Lib/test directory, which might be read-only for the + user running the tests. + - Issue #7324: add a sanity check to regrtest argument parsing to catch the case of an option with no handler. |