Skip to content

Commit f66a050

Browse files
authored
Merge pull request #2 from iritkatriel/pr25913
suggestions
2 parents 420a638 + 240eb9a commit f66a050

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

Lib/test/test_linecache.py

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -245,41 +245,40 @@ def setUp(self):
245245
linecache.clearcache()
246246
self.deleted_file = os_helper.TESTFN + '.1'
247247
self.modified_file = os_helper.TESTFN + '.2'
248-
self.unchange_file = os_helper.TESTFN + '.3'
249-
self.addCleanup(os_helper.unlink, self.deleted_file)
250-
self.addCleanup(os_helper.unlink, self.modified_file)
251-
self.addCleanup(os_helper.unlink, self.unchange_file)
252-
with open(self.deleted_file, 'w', encoding='utf-8') as source:
253-
source.write('print("will be deleted")')
254-
with open(self.modified_file, 'w', encoding='utf-8') as source:
255-
source.write('print("will be modified")')
256-
with open(self.unchange_file, 'w', encoding='utf-8') as source:
257-
source.write('print("unchange")')
248+
self.unchanged_file = os_helper.TESTFN + '.3'
249+
250+
for fname in (self.deleted_file,
251+
self.modified_file,
252+
self.unchanged_file):
253+
self.addCleanup(os_helper.unlink, fname)
254+
with open(fname, 'w', encoding='utf-8') as source:
255+
source.write(f'print("I am {fname}")')
258256

259-
linecache.getlines(self.deleted_file)
260-
linecache.getlines(self.modified_file)
261-
linecache.getlines(self.unchange_file)
257+
self.assertNotIn(fname, linecache.cache)
258+
linecache.getlines(fname)
259+
self.assertIn(fname, linecache.cache)
262260

263261
os.remove(self.deleted_file)
264262
with open(self.modified_file, 'w', encoding='utf-8') as source:
265263
source.write('print("was modified")')
266264

267265
def test_checkcache_for_deleted_file(self):
268-
self.assertEqual(3, len(linecache.cache.keys()))
269266
linecache.checkcache(self.deleted_file)
270-
self.assertEqual(2, len(linecache.cache.keys()))
271-
self.assertNotIn(self.deleted_file, linecache.cache.keys())
267+
self.assertNotIn(self.deleted_file, linecache.cache)
268+
self.assertIn(self.modified_file, linecache.cache)
269+
self.assertIn(self.unchanged_file, linecache.cache)
272270

273271
def test_checkcache_for_modified_file(self):
274-
self.assertEqual(3, len(linecache.cache.keys()))
275272
linecache.checkcache(self.modified_file)
276-
self.assertEqual(2, len(linecache.cache.keys()))
277-
self.assertNotIn(self.modified_file, linecache.cache.keys())
273+
self.assertIn(self.deleted_file, linecache.cache)
274+
self.assertNotIn(self.modified_file, linecache.cache)
275+
self.assertIn(self.unchanged_file, linecache.cache)
278276

279277
def test_checkcache_with_no_parameter(self):
280-
self.assertEqual(3, len(linecache.cache.keys()))
281278
linecache.checkcache()
282-
self.assertEqual([self.unchange_file], list(linecache.cache.keys()))
279+
self.assertNotIn(self.deleted_file, linecache.cache)
280+
self.assertNotIn(self.modified_file, linecache.cache)
281+
self.assertIn(self.unchanged_file, linecache.cache)
283282

284283

285284
if __name__ == "__main__":

0 commit comments

Comments
 (0)