wtf

aiidateam · May 21, 2024 · a9e6290 · a9e6290
1 parent ff0c49f
commit a9e6290
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.docker/pytest.ini b/.docker/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
 minversion = 7.0
-addopts = -ra -q
+addopts = -ra -q --strict-markers
 testpaths =
     tests
diff --git a/.docker/tests/conftest.py b/.docker/tests/conftest.py
@@ -15,7 +15,7 @@ def target_checker(value):
 
 def pytest_addoption(parser):
     parser.addoption(
-        '--target',
+        '--variant',
         action='store',
         required=True,
         help='target (image name) of the docker-compose file to use.',
@@ -25,11 +25,11 @@ def pytest_addoption(parser):
 
 @pytest.fixture(scope='session')
 def variant(pytestconfig):
-    return pytestconfig.getoption('target')
+    return pytestconfig.getoption('variant')
 
 
 @pytest.fixture(scope='session')
-def docker_compose_file(pytestconfig, variant):
+def docker_compose_file(variant):
     return f'docker-compose.{variant}.yml'
 
 

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -48,5 +48,5 @@ jobs:
       run: pip install -r requirements.txt --no-deps
 
     - name: Run tests
-      run: pytest -s --target ${{ inputs.target }}
+      run: pytest -s --target ${{ inputs.target }} tests/
       env: ${{ fromJSON(inputs.images) }}