broadcast errors from run_async functions

jh0ker · jh0ker · commit ef0fe2f26965 · 2017-08-09T23:23:42.000+02:00
diff --git a/telegram/ext/dispatcher.py b/telegram/ext/dispatcher.py
@@ -188,6 +188,9 @@ def _pooled(self):
                 self.logger.warning('DispatcherHandlerFlow is not supported with async '
                                     'functions; func: %s', promise.pooled_function.__name__)
 
+            elif isinstance(promise.exception, TelegramError):
+                self.update_queue.put(promise.exception)
+
     def run_async(self, func, *args, **kwargs):
         """
         Queue a function (with given args/kwargs) to be run asynchronously.
diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -133,6 +133,10 @@ def asyncHandlerTest(self, bot, update):
             self.received_message = update.message.text
             self.message_count += 1
 
+    @run_async
+    def asyncHandlerErrorTest(self, bot, update):
+        raise TelegramError('foobar')
+
     def stringHandlerTest(self, bot, update):
         self.received_message = update
         self.message_count += 1
@@ -170,8 +174,9 @@ def errorRaisingHandlerTest(self, bot, update):
         raise TelegramError(update)
 
     def errorHandlerTest(self, bot, update, error):
-        self.received_message = error.message
-        self.message_count += 1
+        with self.lock:
+            self.received_message = error.message
+            self.message_count += 1
 
     def test_addRemoveTelegramMessageHandler(self):
         self._setup_updater('Test')
@@ -573,6 +578,17 @@ def test_runAsync(self):
         self.assertEqual(self.received_message, 'Test5')
         self.assertEqual(self.message_count, 2)
 
+    def test_runAsyncError(self):
+        self._setup_updater('Test32', messages=1)
+        d = self.updater.dispatcher
+        handler = MessageHandler([], self.asyncHandlerErrorTest)
+        d.add_handler(handler)
+        d.add_error_handler(self.errorHandlerTest)
+        self.updater.start_polling(0.01)
+        sleep(.2)
+        self.assertEqual(self.received_message, 'foobar')
+        self.assertEqual(self.message_count, 1)
+
     def test_multiple_dispatchers(self):
 
         def get_dispatcher_name(q):
