From c52e93e2960cab13fa6512b15f2158f160a793c7 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Mon, 15 Feb 2016 22:52:28 +0100 Subject: [PATCH 1/3] no ellipsis is inserted in big windows --- tests/unit/mainwindow/statusbar/test_textbase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py index c33b11b0b..2b9bd4cc1 100644 --- a/tests/unit/mainwindow/statusbar/test_textbase.py +++ b/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() From f64916b516e3a3a31139e0a825d094a71183ba45 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 21 Feb 2016 17:23:10 +0100 Subject: [PATCH 2/3] Only run geolocation tests on CI Trying to get the device location while running the tests can trigger all kind of funny effects. Since we can't easily mock the GPS responses, we only run those on the CI where we at least have some predictable setup. Fixes #1297. --- pytest.ini | 1 + tests/conftest.py | 1 + tests/integration/features/prompts.feature | 2 ++ 3 files changed, 4 insertions(+) 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 From 609d9b9a2552a024c057bb56dbb3e2763df42c5f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 22 Feb 2016 11:50:38 +0100 Subject: [PATCH 3/3] Regenerate authors. --- README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index de1fefdaa..8fdc2fb49 100644 --- a/README.asciidoc +++ b/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