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

bdd: Add a xfail_norun marker.

Browse Source
This commit is contained in:
Florian Bruhin 2016-01-14 07:53:00 +01:00
parent cf09e477a4
commit 14ff684e99
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -13,6 +13,7 @@ markers =
integration: Tests which test a bigger portion of code, run without coverage. integration: Tests which test a bigger portion of code, run without coverage.
skip: Always skipped test. skip: Always skipped test.
pyqt531_or_newer: Needs PyQt 5.3.1 or newer. pyqt531_or_newer: Needs PyQt 5.3.1 or newer.
xfail_norun: xfail the test with out running it
flakes-ignore = flakes-ignore =
UnusedImport UnusedImport
UnusedVariable UnusedVariable

2
tests/conftest.py
View File

@ -130,6 +130,8 @@ def pytest_collection_modifyitems(items):
item.add_marker(pytest.mark.integration) item.add_marker(pytest.mark.integration)
_apply_platform_markers(item) _apply_platform_markers(item)
if item.get_marker('xfail_norun'):
item.add_marker(pytest.mark.xfail(run=False))
def pytest_ignore_collect(path): def pytest_ignore_collect(path):

4
tests/integration/features/misc.feature
View File

@ -293,7 +293,7 @@ Feature: Various utility commands.
# :print # :print
# Disabled because it causes weird segfaults and QPainter warnings in Qt... # Disabled because it causes weird segfaults and QPainter warnings in Qt...
@skip @xfail_norun
Scenario: print preview Scenario: print preview
When I open data/hello.txt When I open data/hello.txt
And I run :print --preview And I run :print --preview
@ -305,7 +305,7 @@ Feature: Various utility commands.
# printers" qWarning. # printers" qWarning.
# #
# Disabled because it causes weird segfaults and QPainter warnings in Qt... # Disabled because it causes weird segfaults and QPainter warnings in Qt...
@skip @xfail_norun
Scenario: print Scenario: print
When I open data/hello.txt When I open data/hello.txt
And I run :print And I run :print

2
tests/integration/features/prompts.feature
View File

@ -169,7 +169,7 @@ Feature: Prompts
Then the javascript message "notification permission granted" should be logged Then the javascript message "notification permission granted" should be logged
# This actually gives us a denied rather than an aborted # This actually gives us a denied rather than an aborted
@skip @xfail_norun
Scenario: notifications with ask -> abort Scenario: notifications with ask -> abort
When I set content -> notifications to ask When I set content -> notifications to ask
And I open data/prompt/notifications.html And I open data/prompt/notifications.html

7
tests/integration/features/search.feature
View File

@ -28,7 +28,7 @@ Feature: Searching on a page
When I run :search doesnotmatch When I run :search doesnotmatch
Then the warning "Text 'doesnotmatch' not found on page!" should be shown Then the warning "Text 'doesnotmatch' not found on page!" should be shown
@skip @xfail_norun
Scenario: Searching with / and spaces at the end (issue 874) Scenario: Searching with / and spaces at the end (issue 874)
When I run :set-cmd-text -s /space When I run :set-cmd-text -s /space
And I run :command-accept And I run :command-accept
@ -41,9 +41,8 @@ Feature: Searching on a page
And I run :yank-selected And I run :yank-selected
Then the clipboard should contain "/slash" Then the clipboard should contain "/slash"
# xfail takes a long time to timeout, and this doesn't work because this is # This doesn't work because this is QtWebKit behaviour.
# QtWebKit behaviour. @xfail_norun
@skip
Scenario: Searching text with umlauts Scenario: Searching text with umlauts
When I run :search blub When I run :search blub
Then the warning "Text 'blub' not found on page!" should be shown Then the warning "Text 'blub' not found on page!" should be shown