raise handler exceptions from Conection.main()

fixes #125

i3ipc/connection.py

@@ -470,14 +470,19 @@ def _event_socket_poll(self):
             # we have not implemented this event
             return
 
-        self._pubsub.emit(event_name, event)
+        try:
+            self._pubsub.emit(event_name, event)
+        except Exception as e:
+            print(e)
+            raise e
 
     def main(self, timeout: float = 0.0):
         """Starts the main loop for this connection to start handling events.
 
         :param timeout: If given, quit the main loop after ``timeout`` seconds.
         :type timeout: float
         """
+        loop_exception = None
         self._quitting = False
         while True:
             try:
@@ -491,14 +496,16 @@ def main(self, timeout: float = 0.0):
 
                 while not self._event_socket_poll():
                     pass
-
+            except Exception as e:
+                loop_exception = e
+            finally:
                 if timer:
                     timer.cancel()
-            finally:
+
                 self._event_socket_teardown()
 
                 if self._quitting or not self._restarting or not self.auto_reconnect:
-                    return
+                    break
 
                 self._restarting = False
                 # The ipc told us it's restarting and the user wants to survive
@@ -507,6 +514,9 @@ def main(self, timeout: float = 0.0):
                 if not self._wait_for_socket():
                     break
 
+        if loop_exception:
+            raise loop_exception
+
     def main_quit(self):
         """Quits the running main loop for this connection."""
         self._quitting = True

test/aio/test_event_exceptions.py

@@ -16,10 +16,7 @@ def exception_throwing_handler(self, i3, e):
     async def test_event_exceptions(self, i3):
         i3.on('tick', self.exception_throwing_handler)
 
-        def send_tick():
-            asyncio.ensure_future(self.send_tick())
-
-        i3._loop.call_later(0.1, send_tick)
+        asyncio.ensure_future(i3.send_tick())
 
         with pytest.raises(HandlerException):
             await i3.main()

test/aio/test_window.py

@@ -6,7 +6,6 @@
 
 
 class TestWindow(IpcTest):
-    '''
     @pytest.mark.asyncio
     async def test_window_event(self, i3):
         event = None
@@ -26,7 +25,6 @@ def on_window(i3, e):
         assert event
 
         i3.off(on_window)
-        '''
 
     @pytest.mark.asyncio
     async def test_detailed_window_event(self, i3):

test/test_event_exceptions.py

@@ -0,0 +1,21 @@
+from ipctest import IpcTest
+
+from threading import Timer
+import pytest
+
+
+class HandlerException(Exception):
+    pass
+
+
+class TestEventExceptions(IpcTest):
+    def exception_throwing_handler(self, i3, e):
+        raise HandlerException()
+
+    def test_event_exceptions(self, i3):
+        i3.on('tick', self.exception_throwing_handler)
+
+        Timer(0.001, i3.send_tick).start()
+
+        with pytest.raises(HandlerException):
+            i3.main()