diff --git a/pytest.ini b/pytest.ini index 04ebb49c0..e52ef27d8 100644 --- a/pytest.ini +++ b/pytest.ini @@ -16,6 +16,7 @@ markers = pyqt531_or_newer: Needs PyQt 5.3.1 or newer. xfail_norun: xfail the test with out running it flaky: Tests which are flaky and should be rerun + ci: Tests which should only run on CI. qt_log_level_fail = WARNING qt_log_ignore = ^SpellCheck: .* diff --git a/tests/conftest.py b/tests/conftest.py index 1a38d0825..bdfd96510 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -57,6 +57,7 @@ def _apply_platform_markers(item): ('skip', True, "Always skipped."), ('pyqt531_or_newer', PYQT_VERSION < 0x050301, "Needs PyQt 5.3.1 or newer"), + ('ci', 'CI' not in os.environ, "Only runs on CI."), ] for searched_marker, condition, default_reason in markers: diff --git a/tests/integration/features/prompts.feature b/tests/integration/features/prompts.feature index 94059f399..b4a5091ac 100644 --- a/tests/integration/features/prompts.feature +++ b/tests/integration/features/prompts.feature @@ -122,12 +122,14 @@ Feature: Prompts And I click the button Then the javascript message "geolocation permission denied" should be logged + @ci Scenario: Always accepting geolocation When I set content -> geolocation to true And I open data/prompt/geolocation.html in a new tab And I click the button Then the javascript message "geolocation permission denied" should not be logged + @ci Scenario: geolocation with ask -> true When I set content -> geolocation to ask And I open data/prompt/geolocation.html in a new tab