Update test script to not use setuptools, since setuptools test is deprecatd

Author: Stefan Majoor

Dockerfile

@@ -2,4 +2,6 @@ FROM python:3.9
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /binder
 WORKDIR /binder
-ADD . /binder
+ADD setup.py .
+ADD README.md .
+RUN pip install -e .[test]

README.md

@@ -9,13 +9,13 @@ Code Yellow backend framework for SPA webapps with REST-like API.
 
 ## Running the tests
 
-Run with docker `docker compose run binder ./setup.py test` (but you may need to run `docker compose build db binder` first)
-- Access the test database directly by with `docker compose run db psql -h db -U postgres`.
+- Run with `./test`
+- Access the test database directly by with `docker compose run --rm db psql -h db -U postgres`.
 - It may be possible to recreate the test database (for example when you added/changed models). One way of achieving this is to just remove all the docker images that were build `docker compose rm`. The database will be created during the setup in `tests/__init__.py`.
 
 The tests are set up in such a way that there is no need to keep migration files. The setup procedure in `tests/__init__.py` handles the preparation of the database by directly calling some build-in Django commands.
 
-To only run a selection of the tests, use the `-s` flag like `./setup.py test -s tests.test_some_specific_test`.
+To only run a selection of the tests, use the `-k` flag like `./test -k tests.test_some_specific_test`.
 
 ## MySQL support
 

binder/tests_discoverer.py

@@ -1,24 +1,2 @@
-from django.apps import apps
-try:
-    from django.test.runner import is_discoverable
-except ImportError:
-    # Django 4 support
-    from django.test.runner import try_importing
-    def is_discoverable(path):
-        is_importable, _ = try_importing(path)
-        return is_importable
-
-# This prevents discoverer from loading models and views, which will
-# cause all sorts of random failures.
 def load_tests(loader, tests, pattern):
-    for app in apps.get_app_configs():
-        app_path = app.path
-        test_dir = '{}/tests/'.format(app_path)
-        try:
-            if is_discoverable(test_dir):
-                tests.addTests(loader.discover(test_dir))
-        except AssertionError:
-            # This is thrown if the app is loaded from the venv. These can not be tested anyway
-            pass
-
-    return tests
+	return tests

setup.py

@@ -21,7 +21,6 @@
 	url='https://github.com/CodeYellowBV/django-binder',
 	author='Marcel Moreaux',
 	author_email='marcel@codeyellow.nl',
-	test_suite='tests',
 	classifiers=[
 		'Environment :: Web Environment',
 		'Framework :: Django',
@@ -43,13 +42,15 @@
 		'requests >= 2.13.0',
 		'pika == 1.3.2',
 	],
-	tests_require=[
-		'django-hijack >= 2.1.10, < 3.0.0',
-		(
-			'mysqlclient >= 1.3.12'
-			if os.environ.get('BINDER_TEST_MYSQL', '0') == '1' else
-			'psycopg2 >= 2.7'
-		),
-		"openpyxl >= 3.0.0"
-	],
+	extras_require={
+		'test': [
+			'django-hijack >= 2.1.10, < 3.0.0',
+			(
+				'mysqlclient >= 1.3.12'
+				if os.environ.get('BINDER_TEST_MYSQL', '0') == '1' else
+				'psycopg2 >= 2.7'
+			),
+			"openpyxl >= 3.0.0"
+		],
+	}
 )

test

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+docker compose build binder
+
+docker compose run --rm binder python -m unittest "$@"