diff --git a/flamenco_worker/worker.py b/flamenco_worker/worker.py index 1462b1657ff4966141becf8e55d15558c3170e03..f8c46ac12742767defddc031f13da1fd622c7c57 100644 --- a/flamenco_worker/worker.py +++ b/flamenco_worker/worker.py @@ -444,7 +444,7 @@ class FlamencoWorker: elif self._push_act_to_manager is None or self._push_act_to_manager.done(): # Schedule a future push to manager. self._push_act_to_manager = asyncio.ensure_future( - await self.push_to_manager(delay=self.push_act_max_interval)) + self.push_to_manager(delay=self.push_act_max_interval)) async def register_log(self, log_entry, *fmt_args): """Registers a log entry, and possibly sends all queued log entries to upstream Manager. @@ -474,7 +474,7 @@ class FlamencoWorker: elif self._push_log_to_manager is None or self._push_log_to_manager.done(): # Schedule a future push to manager. self._push_log_to_manager = asyncio.ensure_future( - await self.push_to_manager(delay=self.push_log_max_interval)) + self.push_to_manager(delay=self.push_log_max_interval)) def output_produced(self, *paths: typing.Union[str, pathlib.PurePath]): """Registers a produced output (e.g. rendered frame) with the manager. diff --git a/tests/test_worker.py b/tests/test_worker.py index 330d38dd5b7c3e43ca1999dd48112286e3161f84..e620ccee0f4e68d62f2d77fae6dc10dd153b011d 100644 --- a/tests/test_worker.py +++ b/tests/test_worker.py @@ -43,6 +43,18 @@ class AbstractFWorkerTest(AbstractWorkerTest): ) def tearDown(self): + if self.worker._push_act_to_manager is not None: + try: + self.asyncio_loop.run_until_complete(self.worker._push_act_to_manager) + except asyncio.CancelledError: + pass + + if self.worker._push_log_to_manager is not None: + try: + self.asyncio_loop.run_until_complete(self.worker._push_log_to_manager) + except asyncio.CancelledError: + pass + self.shutdown_future.cancel() self.worker.shutdown() self.asyncio_loop.close()