From 34e3052814ca409ffef339dd801ea9816bacdab8 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 3 Aug 2020 10:43:21 -0400 Subject: [PATCH] Don't use global state for testing. --- src/allmydata/test/test_iputil.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/allmydata/test/test_iputil.py b/src/allmydata/test/test_iputil.py index 06ab13f39..d3262a9ea 100644 --- a/src/allmydata/test/test_iputil.py +++ b/src/allmydata/test/test_iputil.py @@ -236,26 +236,28 @@ class GcUtil(unittest.TestCase): def test_gc_after_allocations(self): """The resource tracker triggers allocations every 26 allocations.""" + tracker = gcutil._ResourceTracker() collections = [] self.patch(gc, "collect", lambda: collections.append(1)) for _ in range(2): for _ in range(25): - gcutil.fileDescriptorResource.allocate() + tracker.allocate() self.assertEqual(len(collections), 0) - gcutil.fileDescriptorResource.allocate() + tracker.allocate() self.assertEqual(len(collections), 1) del collections[:] def test_release_delays_gc(self): """Releasing a file descriptor resource delays GC collection.""" + tracker = gcutil._ResourceTracker() collections = [] self.patch(gc, "collect", lambda: collections.append(1)) for _ in range(2): - gcutil.fileDescriptorResource.allocate() + tracker.allocate() for _ in range(3): - gcutil.fileDescriptorResource.release() + tracker.release() for _ in range(25): - gcutil.fileDescriptorResource.allocate() + tracker.allocate() self.assertEqual(len(collections), 0) - gcutil.fileDescriptorResource.allocate() + tracker.allocate() self.assertEqual(len(collections), 1)