[req-changes] Updated runtests and CI

Author: pandafy

.github/workflows/ci.yml

@@ -64,7 +64,6 @@ jobs:
         pip install -U pip wheel setuptools
         pip install -U -r requirements-test.txt
         pip install -U -e .
-        pip install -UI --no-deps https://github.com/openwisp/openwisp-utils/tarball/browser-logs
         pip install ${{ matrix.django-version }}
 
     - name: Start postgres and redis
@@ -78,11 +77,8 @@ jobs:
       if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
       run: |
         coverage run runtests.py --parallel
-        # the following command runs tests with Postgres/PostGIS but
-        # only for specific test cases which are tagged with "db_tests"
-        POSTGRESQL=1 coverage run runtests.py --parallel --keepdb
         # tests the extension capability
-        SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb
+        SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb --exclude-tag=selenium_tests
         coverage combine
         coverage xml
       env:

docs/developer/installation.rst

@@ -41,7 +41,7 @@ Launch Redis and PostgreSQL:
 
 .. code-block:: shell
 
-    docker-compose up -d redis postgres
+    docker compose up -d redis postgres
 
 Setup and activate a virtual-environment (we'll be using `virtualenv
 <https://pypi.org/project/virtualenv/>`_):
@@ -92,7 +92,8 @@ Launch development server:
 
 You can access the admin interface at ``http://127.0.0.1:8000/admin/``.
 
-Run tests with:
+Run tests with (make sure you have the :ref:`selenium dependencies
+<selenium_dependencies>` installed locally first):
 
 .. code-block:: shell
 
@@ -106,9 +107,6 @@ specific tests as follows:
 
 .. code-block:: shell
 
-    # Run database tests against PostgreSQL backend
-    POSTGRESQL=1 ./runtests.py --parallel
-
     # Run only specific selenium tests classes
     cd tests/
     DJANGO_SETTINGS_MODULE=openwisp2.postgresql_settings ./manage.py test openwisp_controller.config.tests.test_selenium.TestDeviceAdmin
@@ -162,13 +160,13 @@ Build from the Dockerfile:
 
 .. code-block:: shell
 
-    docker-compose build
+    docker compose build
 
 Run the docker container:
 
 .. code-block:: shell
 
-    docker-compose up
+    docker compose up
 
 Troubleshooting Steps for Common Installation Issues
 ----------------------------------------------------

runtests.py

@@ -5,34 +5,37 @@
 import sys
 
 import pytest
+from django.core.management import execute_from_command_line
+
+
+def run_tests(args, settings_module):
+    """
+    Run Django tests with the specified settings module.
+    """
+    os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
+    execute_from_command_line(args)
+
 
 if __name__ == '__main__':
     sys.path.insert(0, 'tests')
-    if os.environ.get('POSTGRESQL', False):
-        os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openwisp2.postgresql_settings')
-    else:
-        os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openwisp2.settings')
-    from django.core.management import execute_from_command_line
 
     args = sys.argv
     args.insert(1, 'test')
-
     if not os.environ.get('SAMPLE_APP', False):
         args.insert(2, 'openwisp_controller')
+        app_dir = 'openwisp_controller/'
     else:
         args.insert(2, 'openwisp2')
+        app_dir = 'tests/openwisp2/'
 
-    if os.environ.get('POSTGRESQL', False):
-        args.extend(['--tag', 'db_tests'])
-        args.extend(['--tag', 'selenium_tests'])
-    else:
-        args.extend(['--exclude-tag', 'selenium_tests'])
-
-    execute_from_command_line(args)
+    # Run all tests except Selenium tests using SQLite
+    sqlite_args = args.copy()
+    sqlite_args.extend(['--exclude-tag', 'selenium_tests'])
+    run_tests(sqlite_args, settings_module='openwisp2.settings')
 
-    if not os.environ.get('SAMPLE_APP', False):
-        app_dir = 'openwisp_controller/'
-    else:
-        app_dir = 'tests/openwisp2/'
+    # Run Selenium tests using PostgreSQL
+    psql_args = args.copy()
+    psql_args.extend(['--tag', 'selenium_tests', '--tag', 'db_tests'])
+    run_tests(psql_args, settings_module='openwisp2.postgresql_settings')
 
     sys.exit(pytest.main([app_dir]))