mirrors: convert to pytest

Author: jelly

mirrors/tests/conftest.py

@@ -45,3 +45,20 @@ def mirrorurl(db, mirror, mirrorprotocol, country=COUNTRY,
                                               country=country)
         yield mirror_url
         mirror_url.delete()
+
+
+@pytest.fixture
+def create_mirrorurl(db, mirror, mirrorprotocol):
+    mirrors = []
+    def _create_mirrorurl(country=COUNTRY, url=URL):
+        mirror_url = MirrorUrl.objects.create(url=url,
+                                              protocol=mirrorprotocol,
+                                              mirror=mirror,
+                                              country=country)
+        mirrors.append(mirror_url)
+        return mirror_url
+
+    yield _create_mirrorurl
+
+    for mirror in mirrors:
+        mirror.delete()

mirrors/tests/test_mirrorlist.py

@@ -1,66 +1,50 @@
-from django.test import TestCase
-
-from mirrors.tests import create_mirror_url
 from mirrors.models import Mirror
 
+# TODO(jelle): add test for https/rsync mirrors
+
+
+def test_mirrorlist(client, mirrorurl):
+    response = client.get('/mirrorlist/')
+    assert response.status_code == 200
+
+
+def test_mirrorlist_tier_last(client, mirrorurl):
+    last_tier = Mirror.TIER_CHOICES[-1][0]
+    response = client.get('/mirrorlist/tier/{}/'.format(last_tier + 1))
+    assert response.status_code == 404
+
+
+def test_mirrorlist_all(client, mirrorurl):
+    response = client.get('/mirrorlist/all/')
+    assert response.status_code == 200
+    assert mirrorurl.hostname in response.content.decode()
+
+
+def test_mirrorlist_all_https(client, mirrorurl):
+    response = client.get('/mirrorlist/all/https/')
+    assert response.status_code == 200
+    assert mirrorurl.hostname in response.content.decode()
+
+
+def test_mirrorlist_all_http(client, mirrorurl):
+    # First test that without any http mirrors, we get a 404.
+    response = client.get('/mirrorlist/all/http/')
+    assert response.status_code == 404
+
+
+def test_mirrorlist_status(client, mirrorurl):
+    response = client.get('/mirrorlist/?country=all&use_mirror_status=on')
+    assert response.status_code == 200
+
+
+def test_mirrorlist_filter(client, create_mirrorurl):
+    mirror1 = create_mirrorurl('JP', 'https://jp.org')
+    mirror2 = create_mirrorurl()
+
+    # First test that we correctly see the above mirror.
+    response = client.get('/mirrorlist/?country=JP&protocol=https')
+    assert response.status_code == 200
+    assert mirror1.hostname in response.content.decode()
 
-class MirrorListTest(TestCase):
-    def setUp(self):
-        self.mirror_url = create_mirror_url()
-
-    def tearDown(self):
-        self.mirror_url.delete()
-
-    def test_mirrorlist(self):
-        response = self.client.get('/mirrorlist/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_mirrorlist_tier_last(self):
-        last_tier = Mirror.TIER_CHOICES[-1][0]
-        response = self.client.get('/mirrorlist/tier/{}/'.format(last_tier + 1))
-        self.assertEqual(response.status_code, 404)
-
-    def test_mirrorlist_all(self):
-        response = self.client.get('/mirrorlist/all/')
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.mirror_url.hostname, response.content.decode())
-
-    def test_mirrorlist_all_http(self):
-        response = self.client.get('/mirrorlist/all/http/')
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.mirror_url.hostname, response.content.decode())
-
-    def test_mirrorlist_all_https(self):
-        # First test that without any https mirrors, we get a 404.
-        response = self.client.get('/mirrorlist/all/https/')
-        self.assertEqual(response.status_code, 404)
-
-        # Now, after adding an HTTPS mirror, we expect to succeed.
-        https_mirror_url = create_mirror_url(
-            name='https_mirror',
-            protocol='https',
-            url='https://wikipedia.org')
-        response = self.client.get('/mirrorlist/all/https/')
-        self.assertEqual(response.status_code, 200)
-        https_mirror_url.delete()
-
-    def test_mirrorlist_filter(self):
-        jp_mirror_url = create_mirror_url(
-            name='jp_mirror',
-            country='JP',
-            protocol='https',
-            url='https://wikipedia.jp')
-
-        # First test that we correctly see the above mirror.
-        response = self.client.get('/mirrorlist/?country=JP&protocol=https')
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(jp_mirror_url.hostname, response.content.decode())
-
-        # Now confirm that the US mirror did not show up.
-        self.assertNotIn(self.mirror_url.hostname, response.content.decode())
-
-        jp_mirror_url.delete()
-
-    def test_mirrorlist_status(self):
-        response = self.client.get('/mirrorlist/?country=all&use_mirror_status=on')
-        self.assertEqual(response.status_code, 200)
+    # Now confirm that the US mirror did not show up.
+    assert not mirror2.hostname in response.content.decode()

mirrors/tests/test_mirrorlocations.py

@@ -1,18 +1,9 @@
-from django.test import TestCase
-
-from mirrors.models import CheckLocation
-
-
-class MirrorLocationsTest(TestCase):
-    def setUp(self):
-        self.checklocation = CheckLocation.objects.create(hostname='arch.org',
-                                                          source_ip='8.8.8.8',
-                                                          country='US')
-
-    def test_mirrorlocations_json(self):
-        response = self.client.get('/mirrors/locations/json/')
-        self.assertEqual(response.status_code, 200)
-        data = response.json()
-        self.assertEqual(1, data['version'])
-        location = data['locations'][0]['country_code']
-        self.assertEqual('US', location)
+from mirrors.tests.conftest import COUNTRY
+
+def test_mirrorlocations_json(client, checklocation):
+    response = client.get('/mirrors/locations/json/')
+    assert response.status_code == 200
+    data = response.json()
+    assert 1 == data['version']
+    location = data['locations'][0]['country_code']
+    assert COUNTRY == location