Enable Anope tests on Insp4

.github/workflows/test-devel.yml

@@ -260,8 +260,8 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS
-        -m 'not services'" PATH=~/.local/inspircd/bin:$PATH make inspircd
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/bin:$PATH
+        make inspircd
     - if: always()
       name: Publish results
       uses: actions/upload-artifact@v2
@@ -298,8 +298,8 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS
-        -m 'not services'" PATH=~/.local/inspircd/bin:$PATH  make inspircd-anope
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/bin:$PATH  make
+        inspircd-anope
     - if: always()
       name: Publish results
       uses: actions/upload-artifact@v2

make_workflows.py

@@ -147,7 +147,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor):
         else:
             software_config = config["software"][software_id]
 
-        env += software_config.get("env", {}).get(version_flavor.value, "") + " "
+        env += test_config.get("env", {}).get(version_flavor.value, "") + " "
         if "prefix" in software_config:
             env += f"PATH={software_config['prefix']}/bin:$PATH "
 

workflows.yml

@@ -73,9 +73,6 @@ software:
             release: null
             devel: master
             devel_release: insp3
-        env:
-            # Atheme does not support Insp4 yet, so it fails to connect
-            devel: "PYTEST_ARGS=\"$PYTEST_ARGS -m 'not services'\""
         path: inspircd
         prefix: ~/.local/inspircd
         cache: false  # incremental compilation is frequently broken
@@ -157,6 +154,9 @@ tests:
 
     inspircd-atheme:
         software: [inspircd]
+        env:
+            # Atheme does not support Insp4 yet, so it fails to connect
+            devel: "PYTEST_ARGS=\"$PYTEST_ARGS -m 'not services'\""
 
     inspircd-anope:
         software: [inspircd, anope]