summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
authorRyan Roden-Corrent <ryan@rcorre.net>2017-08-20 21:18:47 -0400
committerRyan Roden-Corrent <ryan@rcorre.net>2017-08-20 21:18:47 -0400
commit111846a909c442fed4aecc715cc91d72a8288ab6 (patch)
tree35f921fd32f9ffcba5f1f87afcc4147335b2f07a /pytest.ini
parent722137ab2967f7bafcfa9ab41a239a0db9345b9f (diff)
parent173688c748cfe7be2ccd79814928a1c2220fe44c (diff)
downloadqutebrowser-111846a909c442fed4aecc715cc91d72a8288ab6.tar.gz
qutebrowser-111846a909c442fed4aecc715cc91d72a8288ab6.zip
Merge remote-tracking branch 'upstream/master' into configmerge
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini
index 0062b26e2..05353f275 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -49,6 +49,7 @@ qt_log_ignore =
^Geoclue error: Process org\.freedesktop\.Geoclue\.Master exited with status 127
^Failed to create Geoclue client interface. Geoclue error: org\.freedesktop\.DBus\.Error\.Disconnected
^QDBusConnection: name 'org.freedesktop.Geoclue.Master' had owner '' but we thought it was ':1.1'
+ ^Failed to create Geoclue client interface. Geoclue error: org\.freedesktop\.DBus\.Error\.Disconnected
^QObject::connect: Cannot connect \(null\)::stateChanged\(QNetworkSession::State\) to QNetworkReplyHttpImpl::_q_networkSessionStateChanged\(QNetworkSession::State\)
^QXcbClipboard: Cannot transfer data, no data available
^load glyph failed