rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip tests needing AppDataLocation on older Qt versions

Browse Source
This commit is contained in:
Florian Bruhin 2017-09-13 17:53:49 +02:00
parent f7d17c4c55
commit 50aab7a802
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -27,6 +27,7 @@ markers =
this: Used to mark tests during development this: Used to mark tests during development
no_invalid_lines: Don't fail on unparseable lines in end2end tests no_invalid_lines: Don't fail on unparseable lines in end2end tests
issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478 issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478
qt55: Tests only running on Qt 5.5 or later
qt_log_level_fail = WARNING qt_log_level_fail = WARNING
qt_log_ignore = qt_log_ignore =
^SpellCheck: .* ^SpellCheck: .*

1
tests/conftest.py
View File

@ -62,6 +62,7 @@ def _apply_platform_markers(config, item):
('no_ci', 'CI' in os.environ, "Skipped on CI."), ('no_ci', 'CI' in os.environ, "Skipped on CI."),
('issue2478', os.name == 'nt' and config.webengine, ('issue2478', os.name == 'nt' and config.webengine,
"Broken with QtWebEngine on Windows"), "Broken with QtWebEngine on Windows"),
('qt55', not qtutils.version_check('5.5'), "Requires Qt 5.5 or newer"),
] ]
for searched_marker, condition, default_reason in markers: for searched_marker, condition, default_reason in markers:

6
tests/unit/utils/test_standarddir.py
View File

@ -53,6 +53,9 @@ def test_fake_mac_auto_config(tmpdir, monkeypatch):
assert standarddir.config(auto=True) == expected assert standarddir.config(auto=True) == expected
# FIXME:conf
# needs AppDataLocation
@pytest.mark.qt55
@pytest.mark.parametrize('what', ['data', 'config']) @pytest.mark.parametrize('what', ['data', 'config'])
def test_fake_windows_data_config(tmpdir, monkeypatch, what): def test_fake_windows_data_config(tmpdir, monkeypatch, what):
"""Make sure the config is correct on a fake Windows.""" """Make sure the config is correct on a fake Windows."""
@ -311,6 +314,9 @@ class TestSystemData:
assert standarddir.data(system=True) == standarddir.data() assert standarddir.data(system=True) == standarddir.data()
# FIXME:conf
# needs AppDataLocation
@pytest.mark.qt55
class TestDataMigrations: class TestDataMigrations:
"""Test moving various data from an old to a new location.""" """Test moving various data from an old to a new location."""