Fixed the tracker, got a bad steer about singletons.

ingest_wikimedia/tracker.py

@@ -13,17 +13,16 @@ class Result(Enum):
     BAD_IMAGE_API = auto()
 
 
-class SingletonBase:
+class Singleton(type):
     _instances = {}
 
-    def __new__(cls, *args, **kwargs):
+    def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            instance = super().__new__(cls)
-            cls._instances[cls] = instance
+            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
         return cls._instances[cls]
 
 
-class Tracker(SingletonBase):
+class Tracker(metaclass=Singleton):
     def __init__(self):
         self.data = {}
         for value in Result:
@@ -37,6 +36,11 @@ def increment(self, status: Result, amount=1) -> None:
     def count(self, status: Result) -> int:
         return self.data[status]
 
+    def reset(self):
+        with self.lock:
+            for value in Result:
+                self.data[value] = 0
+
     def __str__(self) -> str:
         result = "COUNTS:\n"
         for key in self.data:

tests/test_tracker.py

@@ -2,6 +2,12 @@
 from ingest_wikimedia.tracker import Tracker, Result
 
 
+@pytest.fixture(autouse=True)
+def before_and_after():
+    yield
+    Tracker().reset()
+
+
 @pytest.fixture
 def tracker():
     return Tracker()