From cdfbe7e77d2ef139a07d1aa999f5312c282efcad Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Oct 2024 16:29:08 -0400 Subject: [PATCH] skip dastardly --- .github/workflows/distro_tests.yml | 1 + bbot/test/test_step_2/module_tests/base.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/distro_tests.yml b/.github/workflows/distro_tests.yml index 916e600071..879b1ea044 100644 --- a/.github/workflows/distro_tests.yml +++ b/.github/workflows/distro_tests.yml @@ -67,4 +67,5 @@ jobs: - name: Run tests run: | export PATH="$HOME/.local/bin:$PATH" + export BBOT_DISTRO_TESTS=true poetry run pytest --reruns 2 -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=DEBUG . diff --git a/bbot/test/test_step_2/module_tests/base.py b/bbot/test/test_step_2/module_tests/base.py index f5d4255f69..bb63b57e5b 100644 --- a/bbot/test/test_step_2/module_tests/base.py +++ b/bbot/test/test_step_2/module_tests/base.py @@ -89,6 +89,10 @@ def module(self): async def module_test( self, httpx_mock, bbot_httpserver, bbot_httpserver_ssl, monkeypatch, request, caplog, capsys ): + # Skip dastardly test if we're in the distro tests (because dastardly uses docker) + if os.getenv("BBOT_DISTRO_TESTS") and self.name == "dastardly": + pytest.skip("Skipping module_test for dastardly module due to BBOT_DISTRO_TESTS environment variable") + self.log.info(f"Starting {self.name} module test") module_test = self.ModuleTest( self, httpx_mock, bbot_httpserver, bbot_httpserver_ssl, monkeypatch, request, caplog, capsys