From efe40fa7e0d3ed42dd56990b56f4f7263ab89d66 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 Sep 2015 06:12:36 +0200
Subject: [PATCH] Try different workaround for test_ipc issues.

---
 qutebrowser/misc/ipc.py     | 4 ++++
 tests/unit/misc/test_ipc.py | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py
index a1b8bc47b..7e1ee36f8 100644
--- a/qutebrowser/misc/ipc.py
+++ b/qutebrowser/misc/ipc.py
@@ -140,6 +140,10 @@ class IPCServer(QObject):
     @pyqtSlot(int)
     def on_error(self, err):
         """Convenience method which calls _socket_error on an error."""
+        if self._socket is None:
+            # Sometimes this gets called from stale sockets, especially in
+            # tests.
+            return
         self._timer.stop()
         log.ipc.debug("Socket error {}: {}".format(
             self._socket.error(), self._socket.errorString()))
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index f16040490..d38b27930 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -59,15 +59,13 @@ def qlocalserver(qapp):
 
 
 @pytest.yield_fixture
-def qlocalsocket(qapp, qtbot):
+def qlocalsocket(qapp):
     socket = QLocalSocket()
     yield socket
     socket.disconnectFromServer()
     if socket.state() != QLocalSocket.UnconnectedState:
         disconnected = socket.waitForDisconnected(100)
         assert disconnected
-    with qtbot.waitSignal(socket.destroyed, raising=False):
-        socket.deleteLater()
 
 
 class FakeSocket(QObject):