test: use pytest

setup.py test is deprecated, switch to pytest.

Also fix some tests that apparently weren't being run.

Ion.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ deploy
 fabfile.py
 manage.py
 pyproject.toml
+pytest.ini
 requirements.txt
 setup.py
 .dependabot/config.yml

ci/regen-workflow.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
+import json
 import os
 import sys
-import json
 
 try:
     import yaml

ci/spec.yml

@@ -64,7 +64,7 @@ env:
       pip install -U pip setuptools
       pip install -U \
         flake8 pylint pylint-django pylint-plugin-utils isort black==20.8b1 autopep8 \
-        coverage coveralls pyyaml
+        coveralls pyyaml pytest-django
       pip install -U -r requirements.txt
 
       echo "PATH=$PATH" >> $GITHUB_ENV
@@ -134,10 +134,7 @@ jobs:
       - *copy_secret
 
       - name: Regenerate workflow YAML file and check for changes
-        run: |
-          set -e
-          pip install pyyaml
-          ./scripts/build_ensure_no_changes.sh ./ci/regen-workflow.py
+        run: ./scripts/build_ensure_no_changes.sh ./ci/regen-workflow.py
 
       # Build docs/sources
       - name: Build docs
@@ -239,7 +236,7 @@ jobs:
 
       # Tests
       - name: Run tests
-        run: coverage run ./setup.py test
+        run: coverage run -m pytest
       - name: Migrate database
         run: coverage run -a ./manage.py migrate
       - name: Collect static files

docs/conf.py

@@ -17,9 +17,10 @@
 from datetime import datetime
 from unittest import mock
 
-import django
 import sphinx_bootstrap_theme
 
+import django
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

fabfile.py

@@ -1,11 +1,10 @@
 import os
 import traceback
 
+import pkg_resources
 from fabric.api import abort, env, hide, lcd, local, prefix, prompt, puts, shell_env
 from fabric.contrib.console import confirm
 
-import pkg_resources
-
 PRODUCTION_DOCUMENT_ROOT = "/usr/local/www/intranet3"
 REDIS_SESSION_DB = 0
 REDIS_PRODUCTION_CACHE_DB = 1

intranet/apps/api/tests.py

@@ -507,7 +507,7 @@ def test_api_eighth_signup_list(self):
 
     def test_api_bus_list(self):
         self.make_token()
-        route = Route.objects.create(route_name="JT-001", bus_number="JT-001")
+        route = Route.objects.create(route_name="JT-01", bus_number="JT-01")
         response = self.client.get(reverse("api_bus_list"), HTTP_AUTHORIZATION=self.auth)
 
         self.assertEqual(response.status_code, 200)
@@ -517,7 +517,7 @@ def test_api_bus_list(self):
 
     def test_api_bus_detail(self):
         self.make_token()
-        route_1 = Route.objects.create(route_name="JT-001", bus_number="JT-001")
+        route_1 = Route.objects.create(route_name="JT-01", bus_number="JT-01")
         response = self.client.get(reverse("api_bus_detail", args=[route_1.pk]), HTTP_AUTHORIZATION=self.auth)
 
         self.assertEqual(response.status_code, 200)

intranet/apps/bus/tests.py

@@ -36,7 +36,7 @@ def test_bus(self):
         m.assert_called()
 
     def test_routes(self):
-        route = Route.objects.get_or_create(route_name="JT-101", bus_number="JT-101")[0]
+        route = Route.objects.get_or_create(route_name="JT-01", bus_number="JT-01")[0]
         route.status = "a"
         route.space = "_1"
         route.save()
@@ -47,7 +47,7 @@ def test_routes(self):
         self.assertEqual(route.space, "")
 
     def test_route_representation(self):
-        route = Route.objects.get_or_create(route_name="JT-101", bus_number="JT-101")[0]
+        route = Route.objects.get_or_create(route_name="JT-01", bus_number="JT-01")[0]
         route_str = str(route)
 
         self.assertEqual(route.route_name, route_str)

intranet/apps/eighth/tests/admin/test_admin_groups.py

@@ -166,7 +166,7 @@ def test_download_group_csv_view(self):
         group = Group.objects.get_or_create(name="test group 5")[0]
         user1 = get_user_model().objects.get_or_create(username="2021ttest", first_name="Tommy", last_name="Test", student_id=1234568)[0]
         user2 = get_user_model().objects.get_or_create(username="2021ttest1", first_name="Thomas", last_name="Test", student_id=1234567)[0]
-        user3 = get_user_model().objects.get_or_create(username="2021awilliam", first_name="A", last_name="William", student_id=12345679)[0]
+        user3 = get_user_model().objects.get_or_create(username="2021awilliam", first_name="A", last_name="William", student_id=1234569)[0]
         for member in [user1, user2, user3]:
             member.groups.add(group)
             member.save()
@@ -205,7 +205,7 @@ def test_eighth_admin_signup_group(self):
             username="2021awilliam",
             first_name="A",
             last_name="William",
-            student_id=12345679,
+            student_id=1234569,
             user_type="student",
             graduation_year=get_senior_graduation_year(),
         )[0]
@@ -281,7 +281,7 @@ def test_eighth_admin_distribute_group(self):
             username="2021awilliam",
             first_name="A",
             last_name="William",
-            student_id=12345679,
+            student_id=1234569,
             user_type="student",
             graduation_year=get_senior_graduation_year(),
         )[0]
@@ -352,7 +352,7 @@ def test_eighth_admin_distribute_unsigned(self):
             username="2021awilliam",
             first_name="A",
             last_name="William",
-            student_id=12345679,
+            student_id=1234569,
             user_type="student",
             graduation_year=get_senior_graduation_year(),
         )[0]
@@ -417,7 +417,7 @@ def test_eighth_admin_distribute_action(self):
             username="2021awilliam",
             first_name="A",
             last_name="William",
-            student_id=12345679,
+            student_id=1234569,
             user_type="student",
             graduation_year=get_senior_graduation_year(),
         )[0]

intranet/apps/events/tests.py

@@ -143,7 +143,7 @@ def test_add_event(self):
             "location": "Location",
             "scheduled_activity": "",
             "announcement": "",
-            "groups": 1,
+            "groups": [],
             "show_attending": "on",
             "show_on_dashboard": "on",
             "category": "sports",
@@ -228,7 +228,7 @@ def test_modify_event(self):
             "location": "New location",
             "scheduled_activity": "",
             "announcement": "",
-            "groups": 1,
+            "groups": [],
             "show_attending": "on",
             "show_on_dashboard": "on",
             "category": "sports",

intranet/settings/__init__.py

@@ -71,7 +71,7 @@
 PRODUCTION = os.getenv("PRODUCTION", "").upper() == "TRUE"
 IN_CI = any(os.getenv(key, "").upper() == "TRUE" for key in ["TRAVIS", "GITHUB_ACTIONS"])
 # FIXME: figure out a less-hacky way to do this.
-TESTING = "test" in sys.argv
+TESTING = "test" in sys.argv and not IN_CI
 LOGGING_VERBOSE = PRODUCTION
 
 # Whether to report master password attempts

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = intranet.settings
+python_files = tests.py test_*.py

scripts/get_ldif.py

@@ -1,6 +1,8 @@
+import sys
+
 from django.forms.models import model_to_dict
+
 from intranet.apps.users.models import User
-import sys
 
 
 def run(*args):