diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-09-11 07:37:13 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-09-11 07:37:13 +0200 |
| commit | b126030f62597df99861847c4fa7039376cf517b (patch) | |
| tree | 38cdf4ff363070a106169998757a30f2bd706745 | |
| parent | e2c07d3cef1a2de60036ed6672b5c24ca494822c (diff) | |
| download | qutebrowser-b126030f62597df99861847c4fa7039376cf517b.tar.gz qutebrowser-b126030f62597df99861847c4fa7039376cf517b.zip | |
Revert "ipc: Skip problematic test on Ubuntu Trusty."
This reverts commit 729be7e7cc9fa09349b57d77ffc58087231d9e4e.
| -rw-r--r-- | tests/unit/misc/test_ipc.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 37e3e7dc8..29f6f7d99 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -32,7 +32,7 @@ from unittest import mock import pytest import py.path # pylint: disable=import-error -from PyQt5.QtCore import pyqtSignal, QObject, PYQT_VERSION +from PyQt5.QtCore import pyqtSignal, QObject from PyQt5.QtNetwork import QLocalServer, QLocalSocket, QAbstractSocket from PyQt5.QtTest import QSignalSpy @@ -325,9 +325,6 @@ class TestListen: assert file_mode_ok or dir_mode_ok @pytest.mark.posix - @pytest.mark.skipif(PYQT_VERSION < 0x050300, reason="Breaks stuff - " - "FIXME: Remove this when there's a new pytest-qt " - "release!") def test_atime_update(self, qtbot, ipc_server): ipc_server._atime_timer.setInterval(500) # We don't want to wait 6h ipc_server.listen() |