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

Make testsuite work with LC_ALL=C

Browse Source
This commit is contained in:
Florian Bruhin 2017-11-07 17:23:38 +01:00
parent fdc43438ef
commit be08cee63c
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -26,6 +26,7 @@ markers =
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
fake_os: Fake utils.is_* to a fake operating system fake_os: Fake utils.is_* to a fake operating system
unicode_locale: Tests which need an unicode locale to work
qt_log_level_fail = WARNING qt_log_level_fail = WARNING
qt_log_ignore = qt_log_ignore =
^SpellCheck: .* ^SpellCheck: .*

2
tests/conftest.py
View File

@ -63,6 +63,8 @@ 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', utils.is_windows and config.webengine, ('issue2478', utils.is_windows and config.webengine,
"Broken with QtWebEngine on Windows"), "Broken with QtWebEngine on Windows"),
('unicode_locale', sys.getfilesystemencoding() == 'ascii',
"Skipped because of ASCII locale"),
] ]
for searched_marker, condition, default_reason in markers: for searched_marker, condition, default_reason in markers:

1
tests/end2end/features/history.feature
View File

@ -32,6 +32,7 @@ Feature: Page history
Then the history should contain: Then the history should contain:
http://localhost:(port)/data/title%20with%20spaces.html Test title http://localhost:(port)/data/title%20with%20spaces.html Test title
@unicode_locale
Scenario: History item with umlauts Scenario: History item with umlauts
When I open data/äöü.html When I open data/äöü.html
Then the history should contain: Then the history should contain:

5
tests/unit/commands/test_userscripts.py
View File

@ -241,9 +241,8 @@ def test_unicode_error(caplog, qtbot, py_proc, runner):
runner.store_html('') runner.store_html('')
assert len(caplog.records) == 1 assert len(caplog.records) == 1
expected = ("Invalid unicode in userscript output: 'utf-8' codec can't " expected = "Invalid unicode in userscript output: "
"decode byte 0x80 in position 0: invalid start byte") assert caplog.records[0].message.startswith(expected)
assert caplog.records[0].message == expected
@pytest.mark.fake_os('unknown') @pytest.mark.fake_os('unknown')