diff options
5 files changed, 10 insertions, 3 deletions
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index eb5140ca..b217d71d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -270,7 +270,7 @@ jobs: timeout-minutes: 5 run: > ssh -i ssh-key -p2222 alpine@localhost "cd accel-ppp/tests && - doas python3 -m pytest -Wall --order-dependencies -v -m \"not ipoe_driver and not vlan_mon_driver\"" + doas python3 -m pytest -Wall --order-dependencies -v -m \"not ipoe_driver and not vlan_mon_driver and not chap_secrets\"" - name: Display processes and dmesg after tests if: ${{ always() }} run: > @@ -288,7 +288,7 @@ jobs: if: ${{ always() }} run: > ssh -i ssh-key -p2222 alpine@localhost "cd accel-ppp/tests && - doas python3 -m pytest -Wall --order-dependencies -v -m \"not vlan_mon_driver\"" + doas python3 -m pytest -Wall --order-dependencies -v -m \"not vlan_mon_driver and not chap_secrets\"" - name: Display processes and dmesg after tests if: ${{ always() }} run: > @@ -305,7 +305,7 @@ jobs: timeout-minutes: 5 run: > ssh -i ssh-key -p2222 alpine@localhost "cd accel-ppp/tests && - doas python3 -m pytest -Wall --order-dependencies -v" + doas python3 -m pytest -Wall --order-dependencies -v -m \"not chap_secrets\"" - name: Display processes and dmesg after tests if: ${{ always() }} run: > diff --git a/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_chap_secrets.py b/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_chap_secrets.py index 2486e4ea..80c559da 100644 --- a/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_chap_secrets.py +++ b/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_chap_secrets.py @@ -54,6 +54,7 @@ def accel_pppd_config(veth_pair_netns, chap_secrets_config_file): # test dhcpv4 shared session without auth check @pytest.mark.dependency(depends=["ipoe_driver_loaded"], scope="session") @pytest.mark.ipoe_driver +@pytest.mark.chap_secrets def test_ipoe_shared_session_chap_secrets( dhclient_instance, accel_cmd, veth_pair_netns ): diff --git a/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_lua_chap_secrets.py b/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_lua_chap_secrets.py index 7de0d510..fdee7c4a 100644 --- a/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_lua_chap_secrets.py +++ b/tests/accel-pppd/ipoe/dhcpv4/test_ipoe_shared_session_lua_chap_secrets.py @@ -74,6 +74,7 @@ def accel_pppd_config(veth_pair_netns, chap_secrets_config_file, lua_script_file # test dhcpv4 shared session without auth check @pytest.mark.dependency(depends=["ipoe_driver_loaded"], scope="session") @pytest.mark.ipoe_driver +@pytest.mark.chap_secrets def test_ipoe_shared_session_lua_chap_secrets( dhclient_instance, accel_cmd, veth_pair_netns ): diff --git a/tests/accel-pppd/pppoe/test_pppoe_session_chap_secrets.py b/tests/accel-pppd/pppoe/test_pppoe_session_chap_secrets.py index e8ac472d..05d19701 100644 --- a/tests/accel-pppd/pppoe/test_pppoe_session_chap_secrets.py +++ b/tests/accel-pppd/pppoe/test_pppoe_session_chap_secrets.py @@ -68,6 +68,7 @@ def pppd_config(veth_pair_netns): # test pppoe session without auth check +@pytest.mark.chap_secrets def test_pppoe_session_chap_secrets(pppd_instance, accel_cmd): # test that pppd (with accel-pppd) started successfully diff --git a/tests/conftest.py b/tests/conftest.py index 6687ed10..da1f40f4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -26,6 +26,10 @@ def pytest_configure(config): "markers", "vlan_mon_driver: marks tests as related to ipoe kernel module (deselect with '-m \"not vlan_mon_driver\"')", ) + config.addinivalue_line( + "markers", + "chap_secrets: marks tests as related to chap-secrets module (deselect with '-m \"not chap_secrets\"')", + ) # accel-pppd executable file name |