Use pytest

.coveragerc

@@ -7,5 +7,7 @@ omit =
         **/tests/*.py
 	env*
         settings.py
+	conftest.py
         local_settings.py
 	/home/travis/virtualenv*
+	manage.py

.gitignore

@@ -18,3 +18,4 @@ env/
 
 # coverage
 .coverage
+htmlcov

.travis.yml

@@ -3,12 +3,12 @@ language: python
 python:
   - "3.7"
 cache: pip
-install: "pip install -r requirements.txt && pip install coveralls pylint"
+install: "pip install -r requirements.txt && pip install -r requirements_test.txt"
 
 script:
-  - python manage.py collectstatic --noinput
-  - coverage run --rcfile .coveragerc manage.py test
-  - pylint devel main mirrors news packages releng templates todolists visualize *.py
+  - make collectstatic
+  - make lint 
+  - make coverage 
 
 after_success:
   - coveralls

Makefile

@@ -0,0 +1,32 @@
+PYTHON>=python
+PYTEST?=pytest
+PYTEST_OPTIONS+=
+PYTEST_INPUT?=.
+PYTEST_COVERAGE_OPTIONS+=--cov-report=term-missing --cov-report=html:htmlcov --cov=.
+PYTEST_PDB?=0
+PYTEST_PDB_OPTIONS?=--pdb --pdbcls=IPython.terminal.debugger:TerminalPdb
+
+
+ifeq (${PYTEST_PDB},1)
+PYTEST_OPTIONS+= ${PYTEST_PDB_OPTIONS}
+else
+test-pdb: PYTEST_OPTIONS+= ${PYTEST_PDB_OPTIONS}
+endif
+test-pdb: test
+
+
+.PHONY: test lint coverage
+
+lint:
+	pylint devel main mirrors news packages releng templates todolists visualize *.py
+
+collectstatic:
+	python manage.py collectstatic --noinput
+
+test: test-py
+
+test-py coverage:
+	DJANGO_SETTINGS_MODULE=settings ${PYTEST} ${PYTEST_OPTIONS} ${PYTEST_COVERAGE_OPTIONS} ${PYTEST_INPUT}
+
+open-coverage: coverage
+	${BROWSER} htmlcov/index.html

README.md

@@ -60,7 +60,6 @@ packages, you will probably want the following:
         ./manage.py loaddata main/fixtures/*.json
         ./manage.py loaddata devel/fixtures/*.json
         ./manage.py loaddata mirrors/fixtures/*.json
-        ./manage.py loaddata releng/fixtures/*.json
 
 6. Use the following commands to start a service instance
 
@@ -96,14 +95,17 @@ In local\_settings.py add entries to set EMAIL\_HOST to 'localhost' and EMAIL\_P
 
 # Running tests and coverage
 
+Install the test dependencies:
+
+        pip install -r requirements_text.txt
+
 To the unittests execute the following commands:
 
         ./manage.py collectstatic --noinput
         ./manage.py test
 
 Running coverage:
 
-        pip install coverage
         coverage run --omit='env*' --source='.' manage.py test
         coverage report
 

conftest.py

@@ -0,0 +1,60 @@
+import pytest
+
+from django.contrib.auth.models import Group
+from django.core.management import call_command
+
+from devel.models import UserProfile
+
+
+USERNAME = 'joeuser'
+FIRSTNAME = 'Joe'
+LASTNAME = 'User'
+EMAIL = '[email protected]'
+
+
+@pytest.fixture
+def arches(db):
+    call_command('loaddata', 'main/fixtures/arches.json')
+
+
+@pytest.fixture
+def repos(db):
+    call_command('loaddata', 'main/fixtures/repos.json')
+
+
+@pytest.fixture
+def package(db, arches, repos):
+    # TODO: convert to create_package with standard parameters
+    call_command('loaddata', 'main/fixtures/package.json')
+
+
+@pytest.fixture
+def groups(db):
+    call_command('loaddata', 'main/fixtures/groups.json')
+
+
+@pytest.fixture
+def staff_groups(db):
+    call_command('loaddata', 'devel/fixtures/staff_groups.json')
+
+
+@pytest.fixture
+def user(django_user_model):
+    user = django_user_model.objects.create_user(username=USERNAME, password=USERNAME)
+    yield user
+    user.delete()
+
+
+@pytest.fixture
+def userprofile(user):
+    profile = UserProfile.objects.create(user=user,
+                                         public_email=f'{user.username}@archlinux.org')
+    yield profile
+    profile.delete()
+
+
+@pytest.fixture
+def user_client(client, user, userprofile, groups):
+    user.groups.add(Group.objects.get(name='Developers'))
+    client.login(username=USERNAME, password=USERNAME)
+    return client

devel/tests/test_devel.py

@@ -1,42 +1,14 @@
-from django.test import TransactionTestCase
-from django.contrib.auth.models import User, Group
-from devel.models import UserProfile
+def test_clock(user_client):
+    response = user_client.get('/devel/clock/')
+    assert response.status_code == 200
 
 
-class DevelView(TransactionTestCase):
-    fixtures = ['main/fixtures/arches.json', 'main/fixtures/repos.json',
-                'main/fixtures/package.json']
+def test_profile(user_client):
+    response = user_client.get('/devel/profile/')
+    assert response.status_code == 200
+    # Test changing
 
-    def setUp(self):
-        password = 'test'
-        self.user = User.objects.create_superuser('admin',
-                                                  '[email protected]',
-                                                  password)
-        for name in ['Developers', 'Retired Developers']:
-            Group.objects.create(name=name)
-        self.user.groups.add(Group.objects.get(name='Developers'))
-        self.user.save()
-        self.profile = UserProfile.objects.create(user=self.user,
-                                                  public_email="{}@awesome.com".format(self.user.username))
-        self.client.post('/login/', {
-                                    'username': self.user.username,
-                                    'password': password
-        })
 
-    def tearDown(self):
-        self.profile.delete()
-        self.user.delete()
-        Group.objects.all().delete()
-
-    def test_clock(self):
-        response = self.client.get('/devel/clock/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_profile(self):
-        response = self.client.get('/devel/profile/')
-        self.assertEqual(response.status_code, 200)
-        # Test changing
-
-    def test_stats(self):
-        response = self.client.get('/devel/stats/')
-        self.assertEqual(response.status_code, 200)
+def test_stats(user_client):
+    response = user_client.get('/devel/stats/')
+    assert response.status_code == 200

devel/tests/test_pgp_import.py

@@ -1,8 +1,9 @@
 from unittest.mock import patch
 
+import pytest
+
 from django.core.management import call_command
 from django.core.management.base import CommandError
-from django.test import TransactionTestCase
 
 
 CREATED = 1541685162
@@ -19,28 +20,26 @@
 ]
 
 
-class PGPImportTest(TransactionTestCase):
-    fixtures = ['main/fixtures/arches.json', 'main/fixtures/repos.json']
-
-    def test_pgp_import_error(self):
-        with self.assertRaises(CommandError) as e:
-            call_command('pgp_import')
-        self.assertIn('keyring_path', str(e.exception))
-
-    @patch('devel.management.commands.pgp_import.call_gpg')
-    def test_pgp_import_garbage_data(self, mock_call_gpg):
-        mock_call_gpg.return_value = 'barf'
-        with patch('devel.management.commands.pgp_import.logger') as logger:
-            call_command('pgp_import', '/tmp')
-        logger.info.assert_called()
-        logger.info.assert_any_call('created %d, updated %d signatures', 0, 0)
-        logger.info.assert_any_call('created %d, updated %d keys', 0, 0)
-
-    @patch('devel.management.commands.pgp_import.call_gpg')
-    def test_pgp_import(self, mock_call_gpg):
-        mock_call_gpg.return_value = '\n'.join(SIG_DATA)
-        with patch('devel.management.commands.pgp_import.logger') as logger:
-            call_command('pgp_import', '/tmp')
-        logger.info.assert_called()
-        logger.info.assert_any_call('created %d, updated %d signatures', 0, 0)
-        logger.info.assert_any_call('created %d, updated %d keys', 1, 0)
+def test_pgp_import_error(arches, repos):
+    with pytest.raises(CommandError) as e:
+        call_command('pgp_import')
+    assert 'keyring_path' in str(e.value)
+
+
+@patch('devel.management.commands.pgp_import.call_gpg')
+def test_pgp_import_garbage_data(mock_call_gpg, arches, repos):
+    mock_call_gpg.return_value = 'barf'
+    with patch('devel.management.commands.pgp_import.logger') as logger:
+        call_command('pgp_import', '/tmp')
+    logger.info.assert_called()
+    logger.info.assert_any_call('created %d, updated %d signatures', 0, 0)
+    logger.info.assert_any_call('created %d, updated %d keys', 0, 0)
+
+@patch('devel.management.commands.pgp_import.call_gpg')
+def test_pgp_import(mock_call_gpg, arches, repos):
+    mock_call_gpg.return_value = '\n'.join(SIG_DATA)
+    with patch('devel.management.commands.pgp_import.logger') as logger:
+        call_command('pgp_import', '/tmp')
+    logger.info.assert_called()
+    logger.info.assert_any_call('created %d, updated %d signatures', 0, 0)
+    logger.info.assert_any_call('created %d, updated %d keys', 1, 0)

devel/tests/test_rematch_developers.py

@@ -1,14 +1,9 @@
 from unittest.mock import patch
 
-
 from django.core.management import call_command
-from django.test import TransactionTestCase
-
 
-class RematchDeveloperTest(TransactionTestCase):
-    fixtures = ['main/fixtures/arches.json', 'main/fixtures/repos.json']
 
-    def test_rematch_developers(self):
-        with patch('devel.management.commands.rematch_developers.logger') as logger:
-            call_command('rematch_developers')
-        logger.info.assert_called()
+def test_rematch_developers(arches, repos):
+    with patch('devel.management.commands.rematch_developers.logger') as logger:
+        call_command('rematch_developers')
+    logger.info.assert_called()