Merged revisions 76659 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76659 | r.david.murray | 2009-12-03 18:57:59 -0500 (Thu, 03 Dec 2009) | 4 lines 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. ........
This commit is contained in:
parent
cc0c7fbc22
commit
1b479f24dc
|
@ -83,44 +83,40 @@ class LineCacheTests(unittest.TestCase):
|
||||||
getline = linecache.getline
|
getline = linecache.getline
|
||||||
try:
|
try:
|
||||||
# Create a source file and cache its contents
|
# Create a source file and cache its contents
|
||||||
source_name = os.path.join(TEST_PATH, 'linecache_test.py')
|
source_name = support.TESTFN + '.py'
|
||||||
source = open(source_name, 'w')
|
with open(source_name, 'w') as source:
|
||||||
source.write(SOURCE_1)
|
source.write(SOURCE_1)
|
||||||
source.close()
|
source.close()
|
||||||
getline(source_name, 1)
|
getline(source_name, 1)
|
||||||
|
|
||||||
# Keep a copy of the old contents
|
# Keep a copy of the old contents
|
||||||
source_list = []
|
source_list = []
|
||||||
source = open(source_name)
|
source = open(source_name)
|
||||||
for index, line in enumerate(source):
|
for index, line in enumerate(source):
|
||||||
self.assertEquals(line, getline(source_name, index + 1))
|
self.assertEquals(line, getline(source_name, index + 1))
|
||||||
source_list.append(line)
|
source_list.append(line)
|
||||||
source.close()
|
source.close()
|
||||||
|
|
||||||
source = open(source_name, 'w')
|
source = open(source_name, 'w')
|
||||||
source.write(SOURCE_2)
|
source.write(SOURCE_2)
|
||||||
source.close()
|
source.close()
|
||||||
|
|
||||||
# Try to update a bogus cache entry
|
# Try to update a bogus cache entry
|
||||||
linecache.checkcache('dummy')
|
linecache.checkcache('dummy')
|
||||||
|
|
||||||
# Check that the cache matches the old contents
|
# Check that the cache matches the old contents
|
||||||
for index, line in enumerate(source_list):
|
for index, line in enumerate(source_list):
|
||||||
self.assertEquals(line, getline(source_name, index + 1))
|
self.assertEquals(line, getline(source_name, index + 1))
|
||||||
|
|
||||||
# Update the cache and check whether it matches the new source file
|
# Update the cache and check whether it matches the new source file
|
||||||
linecache.checkcache(source_name)
|
linecache.checkcache(source_name)
|
||||||
source = open(source_name)
|
source = open(source_name)
|
||||||
for index, line in enumerate(source):
|
for index, line in enumerate(source):
|
||||||
self.assertEquals(line, getline(source_name, index + 1))
|
self.assertEquals(line, getline(source_name, index + 1))
|
||||||
source_list.append(line)
|
source_list.append(line)
|
||||||
source.close()
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
try:
|
support.unlink(source_name)
|
||||||
source.close()
|
|
||||||
finally:
|
|
||||||
support.unlink(source_name)
|
|
||||||
|
|
||||||
def test_main():
|
def test_main():
|
||||||
support.run_unittest(LineCacheTests)
|
support.run_unittest(LineCacheTests)
|
||||||
|
|
|
@ -101,6 +101,10 @@ Build
|
||||||
Tests
|
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
|
- Issue #7324: add a sanity check to regrtest argument parsing to
|
||||||
catch the case of an option with no handler.
|
catch the case of an option with no handler.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue