Skip to content

Commit a4ebbe0

Browse files
committed
Use new "scanplugins" pytest marker
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 61c3283 commit a4ebbe0

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

azure-pipelines.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ jobs:
3232
--ignore=tests/licensedcode/test_detection_datadriven1.py \
3333
--ignore=tests/licensedcode/test_detection_datadriven2.py \
3434
--ignore=tests/licensedcode/test_detection_datadriven3.py \
35-
--ignore=tests/licensedcode/test_detection_datadriven4.py \
36-
--ignore=tests/licensedcode/test_installed_license_detection.py \
35+
--ignore=tests/licensedcode/test_detection_datadriven4.py
3736
tests/licensedcode
3837
3938
license_datadriven1_2: |
@@ -79,10 +78,6 @@ jobs:
7978
venv/bin/pytest -n 3 -vvs --test-suite=all \
8079
tests/licensedcode/test_zzzz_cache.py
8180
82-
installed_licenses: |
83-
venv/bin/pytest -vvs --test-suite=all \
84-
tests/licensedcode/test_installed_license_detection.py
85-
8681
# this test runs in isolation because it modifies the actual
8782
# license index with additional licenses provided by a plugin
8883
# and we use the special --test-suite=plugins marker for these
@@ -91,7 +86,8 @@ jobs:
9186
venv/bin/pip install tests/licensedcode/data/additional_license_location_provider/plugin/licenses_to_install2
9287
venv/bin/scancode --reindex-licenses
9388
venv/bin/pytest -vvs --test-suite=plugins \
94-
tests/licensedcode/test_additional_license_location_provider.py
89+
tests/licensedcode/test_additional_license_location_provider.py \
90+
tests/licensedcode/test_installed_license_detection.py
9591
9692
9793
- template: etc/ci/azure-posix.yml

tests/licensedcode/test_installed_license_detection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"""
2525

2626

27-
@pytest.mark.scanslow
27+
@pytest.mark.scanplugins
2828
def test_detection_with_single_installed_external_license():
2929
test_dir = test_env.get_test_loc('plugin_license/installed_licenses/scan', copy=True)
3030
result_file = test_env.get_temp_file('json')
@@ -40,7 +40,7 @@ def test_detection_with_single_installed_external_license():
4040
check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
4141

4242

43-
@pytest.mark.scanslow
43+
@pytest.mark.scanplugins
4444
def test_detection_with_single_installed_external_rule():
4545
test_dir = test_env.get_test_loc('plugin_license/installed_rules/scan', copy=True)
4646
result_file = test_env.get_temp_file('json')

0 commit comments

Comments
 (0)