stop using unit tests base classes (#391)

Author: asherf

django_prometheus/tests/test_django_prometheus.py

@@ -1,10 +1,8 @@
 #!/usr/bin/env python
-import unittest
-
 from django_prometheus.utils import PowersOf
 
 
-class DjangoPrometheusTest(unittest.TestCase):
+class TestDjangoPrometheus:
     def testPowersOf(self):
         """Tests utils.PowersOf."""
         assert [0, 1, 2, 4, 8] == PowersOf(2, 4)

django_prometheus/tests/test_testutils.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-import unittest
 from operator import itemgetter
 
 import prometheus_client
+import pytest
 
 from django_prometheus.testutils import (
     assert_metric_diff,
@@ -16,39 +16,48 @@
 )
 
 
-class PrometheusTestCaseMixinTest(unittest.TestCase):
-    def setUp(self):
-        self.registry = prometheus_client.CollectorRegistry()
-        self.some_gauge = prometheus_client.Gauge("some_gauge", "Some gauge.", registry=self.registry)
-        self.some_gauge.set(42)
-        self.some_labelled_gauge = prometheus_client.Gauge(
+class TestPrometheusTestCaseMixin:
+    @pytest.fixture()
+    def registry(self):
+        return prometheus_client.CollectorRegistry()
+
+    @pytest.fixture(autouse=True)
+    def some_gauge(self, registry):
+        some_gauge = prometheus_client.Gauge("some_gauge", "Some gauge.", registry=registry)
+        some_gauge.set(42)
+        return some_gauge
+
+    @pytest.fixture(autouse=True)
+    def some_labelled_gauge(self, registry):
+        some_labelled_gauge = prometheus_client.Gauge(
             "some_labelled_gauge",
             "Some labelled gauge.",
             ["labelred", "labelblue"],
-            registry=self.registry,
+            registry=registry,
         )
-        self.some_labelled_gauge.labels("pink", "indigo").set(1)
-        self.some_labelled_gauge.labels("pink", "royal").set(2)
-        self.some_labelled_gauge.labels("carmin", "indigo").set(3)
-        self.some_labelled_gauge.labels("carmin", "royal").set(4)
+        some_labelled_gauge.labels("pink", "indigo").set(1)
+        some_labelled_gauge.labels("pink", "royal").set(2)
+        some_labelled_gauge.labels("carmin", "indigo").set(3)
+        some_labelled_gauge.labels("carmin", "royal").set(4)
+        return some_labelled_gauge
 
-    def test_get_metric(self):
+    def test_get_metric(self, registry):
         """Tests get_metric."""
-        assert 42 == get_metric("some_gauge", registry=self.registry)
+        assert 42 == get_metric("some_gauge", registry=registry)
         assert 1 == get_metric(
             "some_labelled_gauge",
-            registry=self.registry,
+            registry=registry,
             labelred="pink",
             labelblue="indigo",
         )
 
-    def test_get_metrics_vector(self):
+    def test_get_metrics_vector(self, registry):
         """Tests get_metrics_vector."""
-        vector = get_metrics_vector("some_nonexistent_gauge", registry=self.registry)
+        vector = get_metrics_vector("some_nonexistent_gauge", registry=registry)
         assert [] == vector
-        vector = get_metrics_vector("some_gauge", registry=self.registry)
+        vector = get_metrics_vector("some_gauge", registry=registry)
         assert [({}, 42)] == vector
-        vector = get_metrics_vector("some_labelled_gauge", registry=self.registry)
+        vector = get_metrics_vector("some_labelled_gauge", registry=registry)
         assert sorted(
             [
                 ({"labelred": "pink", "labelblue": "indigo"}, 1),
@@ -59,57 +68,55 @@ def test_get_metrics_vector(self):
             key=itemgetter(1),
         ) == sorted(vector, key=itemgetter(1))
 
-    def test_assert_metric_equal(self):
+    def test_assert_metric_equal(self, registry):
         """Tests assert_metric_equal."""
         # First we test that a scalar metric can be tested.
-        assert_metric_equal(42, "some_gauge", registry=self.registry)
+        assert_metric_equal(42, "some_gauge", registry=registry)
 
-        assert_metric_not_equal(43, "some_gauge", registry=self.registry)
+        assert_metric_not_equal(43, "some_gauge", registry=registry)
 
         # Here we test that assert_metric_equal fails on nonexistent gauges.
-        assert_metric_not_equal(42, "some_nonexistent_gauge", registry=self.registry)
+        assert_metric_not_equal(42, "some_nonexistent_gauge", registry=registry)
 
         # Here we test that labelled metrics can be tested.
         assert_metric_equal(
             1,
             "some_labelled_gauge",
-            registry=self.registry,
+            registry=registry,
             labelred="pink",
             labelblue="indigo",
         )
 
         assert_metric_not_equal(
             1,
             "some_labelled_gauge",
-            registry=self.registry,
+            registry=registry,
             labelred="tomato",
             labelblue="sky",
         )
 
-    def test_registry_saving(self):
+    def test_registry_saving(self, registry, some_gauge, some_labelled_gauge):
         """Tests save_registry and frozen registries operations."""
-        frozen_registry = save_registry(registry=self.registry)
+        frozen_registry = save_registry(registry=registry)
         # Test that we can manipulate a frozen scalar metric.
         assert 42 == get_metric_from_frozen_registry("some_gauge", frozen_registry)
-        self.some_gauge.set(99)
+        some_gauge.set(99)
         assert 42 == get_metric_from_frozen_registry("some_gauge", frozen_registry)
-        assert_metric_diff(frozen_registry, 99 - 42, "some_gauge", registry=self.registry)
-
-        assert_metric_no_diff(frozen_registry, 1, "some_gauge", registry=self.registry)
-
+        assert_metric_diff(frozen_registry, 99 - 42, "some_gauge", registry=registry)
+        assert_metric_no_diff(frozen_registry, 1, "some_gauge", registry=registry)
         # Now test the same thing with a labelled metric.
         assert 1 == get_metric_from_frozen_registry(
             "some_labelled_gauge", frozen_registry, labelred="pink", labelblue="indigo"
         )
-        self.some_labelled_gauge.labels("pink", "indigo").set(5)
+        some_labelled_gauge.labels("pink", "indigo").set(5)
         assert 1 == get_metric_from_frozen_registry(
             "some_labelled_gauge", frozen_registry, labelred="pink", labelblue="indigo"
         )
         assert_metric_diff(
             frozen_registry,
             5 - 1,
             "some_labelled_gauge",
-            registry=self.registry,
+            registry=registry,
             labelred="pink",
             labelblue="indigo",
         )
@@ -118,7 +125,7 @@ def test_registry_saving(self):
             frozen_registry,
             1,
             "some_labelled_gauge",
-            registry=self.registry,
+            registry=registry,
             labelred="pink",
             labelblue="indigo",
         )