From b12a07229c8b92747be0f4910f33626fdda80af9 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sun, 5 Dec 2021 09:31:51 -0500 Subject: [PATCH] tests: Add 'domain' mark for apps that add/remove domains Test: - "py.test-3 --include-functional -m domain" tests the marked apps. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/modules/avahi/tests/test_functional.py | 5 ++++- plinth/modules/config/tests/test_functional.py | 5 ++++- plinth/modules/dynamicdns/tests/test_functional.py | 3 ++- plinth/modules/pagekite/tests/test_functional.py | 2 +- plinth/modules/tor/tests/test_functional.py | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/plinth/modules/avahi/tests/test_functional.py b/plinth/modules/avahi/tests/test_functional.py index 076c14f20..9263b3026 100644 --- a/plinth/modules/avahi/tests/test_functional.py +++ b/plinth/modules/avahi/tests/test_functional.py @@ -7,7 +7,10 @@ import pytest from plinth.tests.functional import BaseAppTests -pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.avahi] +pytestmark = [ + pytest.mark.system, pytest.mark.essential, pytest.mark.domain, + pytest.mark.avahi +] class TestAvahiApp(BaseAppTests): diff --git a/plinth/modules/config/tests/test_functional.py b/plinth/modules/config/tests/test_functional.py index f6e35787e..be7860c3f 100644 --- a/plinth/modules/config/tests/test_functional.py +++ b/plinth/modules/config/tests/test_functional.py @@ -6,7 +6,10 @@ Functional, browser based tests for config app. import pytest from plinth.tests import functional -pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.config] +pytestmark = [ + pytest.mark.system, pytest.mark.essential, pytest.mark.domain, + pytest.mark.config +] @pytest.fixture(scope='module', autouse=True) diff --git a/plinth/modules/dynamicdns/tests/test_functional.py b/plinth/modules/dynamicdns/tests/test_functional.py index a6064e97a..8f2655532 100644 --- a/plinth/modules/dynamicdns/tests/test_functional.py +++ b/plinth/modules/dynamicdns/tests/test_functional.py @@ -10,7 +10,8 @@ import pytest from plinth.tests import functional pytestmark = [ - pytest.mark.system, pytest.mark.essential, pytest.mark.dynamicdns + pytest.mark.system, pytest.mark.essential, pytest.mark.domain, + pytest.mark.dynamicdns ] diff --git a/plinth/modules/pagekite/tests/test_functional.py b/plinth/modules/pagekite/tests/test_functional.py index 6c04074b2..cc5087f83 100644 --- a/plinth/modules/pagekite/tests/test_functional.py +++ b/plinth/modules/pagekite/tests/test_functional.py @@ -6,7 +6,7 @@ Functional, browser based tests for pagekite app. import pytest from plinth.tests import functional -pytestmark = [pytest.mark.system, pytest.mark.pagekite] +pytestmark = [pytest.mark.system, pytest.mark.domain, pytest.mark.pagekite] # TODO Scenario: Enable standard services # TODO Scenario: Disable standard services diff --git a/plinth/modules/tor/tests/test_functional.py b/plinth/modules/tor/tests/test_functional.py index 0efca9a25..6804c24e6 100644 --- a/plinth/modules/tor/tests/test_functional.py +++ b/plinth/modules/tor/tests/test_functional.py @@ -14,7 +14,7 @@ _TOR_FEATURE_TO_ELEMENT = { 'software': 'tor-apt_transport_tor_enabled' } -pytestmark = [pytest.mark.apps, pytest.mark.tor] +pytestmark = [pytest.mark.apps, pytest.mark.domain, pytest.mark.tor] class TestTorApp(functional.BaseAppTests):