From e98f1c8e26c1173c6c2684e09e3a926fc92d08a0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 1 Sep 2020 16:31:59 -0400 Subject: Rework per-binding test marking Rework the test marking to allow deriving the test mark name for a given binding from the binding name, i.e. agl-service-X. Due to dashes not being valid in pytest marks, underscores have been used instead, i.e. agl-service-can-low-level -> can_low_level. The intent is to allow CI tooling to easily work up a pytest -k option to run the tests for a specific binding. Signed-off-by: Scott Murray --- pyagl/pytest.ini | 9 +++++---- pyagl/tests/test_bluetooth_map.py | 2 +- pyagl/tests/test_bluetooth_pbap.py | 2 +- pyagl/tests/test_can.py | 2 +- pyagl/tests/test_homescreen.py | 2 +- pyagl/tests/test_signal_composer.py | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pyagl/pytest.ini b/pyagl/pytest.ini index db7257a..6587041 100644 --- a/pyagl/pytest.ini +++ b/pyagl/pytest.ini @@ -6,13 +6,14 @@ markers = hwrequired: verb tests requiring available physical hardware audiomixer: agl-service-audiomixer tests bluetooth: agl-service-bluetooth tests - btmap: agl-service-bluetooth-map tests - btpbap: agl-service-bluetooth-pbap tests + bluetooth_map: agl-service-bluetooth-map tests + bluetooth_pbap: agl-service-bluetooth-pbap tests geoclue: agl-service-geoclue tests + homescreen: agl-service-homescreen tests network: agl-service-network tests nfc: agl-service-nfc tests gps: agl-service-gps tests weather: agl-service-weather tests mediascanner: agl-service-mediascanner tests - sigcomp: agl-service-signal-composer tests - can: agl-service-can-low-level tests + signal_composer: agl-service-signal-composer tests + can_low_level: agl-service-can-low-level tests diff --git a/pyagl/tests/test_bluetooth_map.py b/pyagl/tests/test_bluetooth_map.py index fee0916..d7bc3d9 100644 --- a/pyagl/tests/test_bluetooth_map.py +++ b/pyagl/tests/test_bluetooth_map.py @@ -21,7 +21,7 @@ from pyagl.services.base import AFBResponse, AFBT from pyagl.services.bluetooth_map import BTMAPService as BMP import logging -pytestmark = [pytest.mark.asyncio, pytest.mark.btmap] +pytestmark = [pytest.mark.asyncio, pytest.mark.bluetooth_map] @pytest.fixture(scope='module') diff --git a/pyagl/tests/test_bluetooth_pbap.py b/pyagl/tests/test_bluetooth_pbap.py index b70c914..bd91258 100644 --- a/pyagl/tests/test_bluetooth_pbap.py +++ b/pyagl/tests/test_bluetooth_pbap.py @@ -21,7 +21,7 @@ import logging from pyagl.services.base import AFBResponse, AFBT from pyagl.services.bluetooth_pbap import BTPBAPService as PBAP -pytestmark = [pytest.mark.asyncio, pytest.mark.btpbap] +pytestmark = [pytest.mark.asyncio, pytest.mark.bluetooth_pbap] @pytest.fixture(scope='module') diff --git a/pyagl/tests/test_can.py b/pyagl/tests/test_can.py index 1283939..ef66f2c 100644 --- a/pyagl/tests/test_can.py +++ b/pyagl/tests/test_can.py @@ -5,7 +5,7 @@ import logging from pyagl.services.base import AFBResponse, AFBT from pyagl.services.can import CANService as cs -pytestmark = [pytest.mark.asyncio, pytest.mark.can] +pytestmark = [pytest.mark.asyncio, pytest.mark.can_low_level] @pytest.fixture(scope='module') diff --git a/pyagl/tests/test_homescreen.py b/pyagl/tests/test_homescreen.py index 35ffd0d..521fcc3 100644 --- a/pyagl/tests/test_homescreen.py +++ b/pyagl/tests/test_homescreen.py @@ -21,7 +21,7 @@ from pyagl.services.base import AFBResponse, AFBT from concurrent.futures import TimeoutError from pyagl.services.homescreen import HomeScreenService as hcs -pytestmark = pytest.mark.asyncio +pytestmark = [pytest.mark.asyncio, pytest.mark.homescreen] @pytest.fixture(scope='module') diff --git a/pyagl/tests/test_signal_composer.py b/pyagl/tests/test_signal_composer.py index cafa052..a306fdf 100644 --- a/pyagl/tests/test_signal_composer.py +++ b/pyagl/tests/test_signal_composer.py @@ -21,7 +21,7 @@ from pyagl.services.base import AFBResponse, AFBT from pyagl.services.signal_composer import SignalComposerService as scs -pytestmark = [pytest.mark.asyncio, pytest.mark.can] +pytestmark = [pytest.mark.asyncio, pytest.mark.can_low_level] @pytest.fixture(scope='module') -- cgit 1.2.3-korg