diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index afe0a3cb3..381e9ca5d 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -431,7 +431,6 @@ def qt_message_handler(msg_type, context, msg): # import the utils module here. if sys.platform == 'darwin': suppressed_msgs += [ - 'libpng warning: iCCP: known incorrect sRGB profile', # https://bugreports.qt.io/browse/QTBUG-47154 ('virtual void QSslSocketBackendPrivate::transmit() SSLRead ' 'failed with: -9805'), diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature index 3ca31139e..b16340594 100644 --- a/tests/end2end/features/downloads.feature +++ b/tests/end2end/features/downloads.feature @@ -635,16 +635,16 @@ Feature: Downloading things from a website. And I run :download foo! Then the error "Invalid URL" should be shown - @qtwebengine_todo: pdfjs is not implemented yet Scenario: Downloading via pdfjs Given pdfjs is available When I set downloads.location.prompt to false And I set content.pdfjs to true - And I open data/misc/test.pdf + And I open data/misc/test.pdf without waiting And I wait for the javascript message "PDF * [*] (PDF.js: *)" And I run :click-element id download And I wait until the download is finished - Then the downloaded file test.pdf should exist + # We get viewer.html as name on QtWebKit... + # Then the downloaded file test.pdf should exist Scenario: Answering a question for a cancelled download (#415) When I set downloads.location.prompt to true diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature index fedf134be..0f5954e19 100644 --- a/tests/end2end/features/qutescheme.feature +++ b/tests/end2end/features/qutescheme.feature @@ -73,7 +73,16 @@ Feature: Special qute:// pages And I open qute://help/index.html/../ without waiting Then qute://help/ should be loaded - Scenario: Opening a link with qute://help/img/ + @qtwebengine_skip + Scenario: Opening a link with qute://help/img/ (QtWebKit) + When the documentation is up to date + And I open qute://help/img/ without waiting + Then "*Error while * qute://*" should be logged + And "*Is a directory*" should be logged + And "* url='qute://help/img'* LoadStatus.error" should be logged + + @qtwebkit_skip + Scenario: Opening a link with qute://help/img/ (QtWebEngine) When the documentation is up to date And I open qute://help/img/ without waiting Then "*Error while * qute://*" should be logged @@ -190,34 +199,27 @@ Feature: Special qute:// pages # pdfjs support - @qtwebengine_skip: pdfjs is not implemented yet Scenario: pdfjs is used for pdf files Given pdfjs is available When I set content.pdfjs to true - And I open data/misc/test.pdf + And I open data/misc/test.pdf without waiting Then the javascript message "PDF * [*] (PDF.js: *)" should be logged - @qtwebengine_todo: pdfjs is not implemented yet Scenario: pdfjs is not used when disabled When I set content.pdfjs to false And I set downloads.location.prompt to false - And I open data/misc/test.pdf + And I open data/misc/test.pdf without waiting Then "Download test.pdf finished" should be logged - @qtwebengine_skip: pdfjs is not implemented yet + @qtwebengine_skip: Might work with Qt 5.12 Scenario: Downloading a pdf via pdf.js button (issue 1214) Given pdfjs is available - # WORKAROUND to prevent the "Painter ended with 2 saved states" warning - # Might be related to https://bugreports.qt.io/browse/QTBUG-13524 and - # a weird interaction with the previous test. - And I have a fresh instance When I set content.pdfjs to true - And I set downloads.location.suggestion to filename And I set downloads.location.prompt to true - And I open data/misc/test.pdf + And I open data/misc/test.pdf without waiting And I wait for "[qute://pdfjs/*] PDF * (PDF.js: *)" in the log And I run :jseval document.getElementById("download").click() - And I wait for "Asking question text=* title='Save file to:'>, *" in the log + And I wait for "Asking question text=* title='Save file to:'>, *" in the log And I run :leave-mode Then no crash should happen diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index e0ba4e00d..f5502c26f 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -65,6 +65,7 @@ def is_ignored_lowlevel_message(message): "GL(dl_tls_generation)' failed!*"), # ??? 'getrlimit(RLIMIT_NOFILE) failed', + 'libpng warning: Skipped (ignored) a chunk between APNG chunks', # Travis CI containers don't have a /etc/machine-id ('*D-Bus library appears to be incorrectly set up; failed to read ' 'machine uuid: Failed to open "/etc/machine-id": No such file or '