Merge branch 'master' of https://github.com/The-Compiler/qutebrowser

README.asciidoc

@@ -147,8 +147,8 @@ Contributors, sorted by the number of commits in descending order:
 * Bruno Oliveira
 * Alexander Cogneau
 * Martin Tournoij
-* Raphael Pierzina
 * Felix Van der Jeugt
+* Raphael Pierzina
 * Joel Torstensson
 * Claude
 * Patric Schmitz

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: .*

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:

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

tests/unit/mainwindow/statusbar/test_textbase.py

@@ -46,7 +46,7 @@ def test_elided_text(qtbot, elidemode, check):
     """
     label = TextBase(elidemode=elidemode)
     qtbot.add_widget(label)
-    long_string = 'Hello world! ' * 20
+    long_string = 'Hello world! ' * 100
     label.setText(long_string)
     label.resize(100, 50)
     label.show()