From f718b66c48d0319cd301ad364757660fbc4a844c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 17 Feb 2017 12:13:08 +0100 Subject: [PATCH] Disable mhtml tests for Qt 5.6 --- tests/end2end/features/downloads.feature | 2 ++ tests/end2end/test_mhtml_e2e.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature index b55673344..1e461040d 100644 --- a/tests/end2end/features/downloads.feature +++ b/tests/end2end/features/downloads.feature @@ -197,6 +197,7 @@ Feature: Downloading things from a website. ## mhtml downloads + @qt>=5.8 Scenario: Downloading as mhtml is available When I open data/title.html And I run :download --mhtml @@ -226,6 +227,7 @@ Feature: Downloading things from a website. And I wait for "File successfully written." in the log Then the downloaded file Test title.mhtml should exist + @qt>=5.8 Scenario: Opening a mhtml download directly When I set storage -> prompt-download-directory to true And I open html diff --git a/tests/end2end/test_mhtml_e2e.py b/tests/end2end/test_mhtml_e2e.py index 46ece8f0e..8181b1ed9 100644 --- a/tests/end2end/test_mhtml_e2e.py +++ b/tests/end2end/test_mhtml_e2e.py @@ -26,6 +26,8 @@ import collections import pytest +from qutebrowser.utils import qtutils + def collect_tests(): basedir = os.path.dirname(__file__) @@ -104,6 +106,9 @@ def _test_mhtml_requests(test_dir, test_path, httpbin): @pytest.mark.parametrize('test_name', collect_tests()) def test_mhtml(request, test_name, download_dir, quteproc, httpbin): + if not qtutils.version_check('5.7'): + pytest.skip("mhtml is unsupported with Qt < 5.7") + quteproc.set_setting('storage', 'download-directory', download_dir.location) quteproc.set_setting('storage', 'prompt-download-directory', 'false')