Merge pull request #201 from pnuu/debug-ci-failures

Fix test failures
pytroll · Feb 29, 2024 · dc4b933 · dc4b933
2 parents aaf85a9 + a4ac1f5
commit dc4b933
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/trollflow2/tests/test_launcher.py b/trollflow2/tests/test_launcher.py
@@ -382,11 +382,11 @@ def setUp(self):
     def test_run_does_not_call_process_directly(self):
         """Test that process is called through Process."""
         from trollflow2.launcher import Runner
-        with mock.patch('trollflow2.launcher.yaml.load'),\
-                mock.patch('trollflow2.launcher.open'),\
-                mock.patch('trollflow2.launcher.generate_messages') as generate_messages,\
-                mock.patch('trollflow2.launcher.process') as process,\
-                mock.patch('trollflow2.launcher.check_results'),\
+        with mock.patch('trollflow2.launcher.yaml.load'), \
+                mock.patch('trollflow2.launcher.open'), \
+                mock.patch('trollflow2.launcher.generate_messages') as generate_messages, \
+                mock.patch('trollflow2.launcher.process') as process, \
+                mock.patch('trollflow2.launcher.check_results'), \
                 mock.patch('multiprocessing.get_context'):
             generate_messages.side_effect = ['foo', KeyboardInterrupt]
             prod_list = {'product_list': {}}
@@ -400,8 +400,8 @@ def test_run_does_not_call_process_directly(self):
     def test_run_relies_on_listener(self):
         """Test running relies on listener."""
         from trollflow2.launcher import Runner
-        with mock.patch('trollflow2.launcher.yaml.load') as yaml_load,\
-                mock.patch('trollflow2.launcher.open'),\
+        with mock.patch('trollflow2.launcher.yaml.load') as yaml_load, \
+                mock.patch('trollflow2.launcher.open'), \
                 mock.patch('multiprocessing.get_context') as get_context, \
                 mock.patch('trollflow2.launcher.ListenerContainer') as lc_:
             msg = mock.MagicMock()
@@ -420,7 +420,7 @@ def test_run_relies_on_listener(self):
                 runner.run()
             except KeyboardInterrupt:
                 pass
-            listener.output_queue.called_once()
+            listener.output_queue.get.assert_called_once()
             lc_.assert_called_with(addresses=None, nameserver='localhost',
                                    topics=['/topic1', '/topic2'])
             # Subscriber topics are removed from config
@@ -451,9 +451,9 @@ def test_subprocess_is_spawned(self):
 def run_on_a_simple_product_list(config):
     """Run a simple (fake) product list."""
     from trollflow2.launcher import Runner
-    with mock.patch('trollflow2.launcher.yaml.load') as yaml_load,\
-            mock.patch('trollflow2.launcher.open'),\
-            mock.patch('multiprocessing.get_context') as get_context,\
+    with mock.patch('trollflow2.launcher.yaml.load') as yaml_load, \
+            mock.patch('trollflow2.launcher.open'), \
+            mock.patch('multiprocessing.get_context') as get_context, \
             mock.patch('trollflow2.launcher.ListenerContainer') as lc_:
 
         msg = mock.MagicMock()
@@ -486,8 +486,8 @@ def setUp(self):
     def test_run_keyboard_interrupt(self):
         """Test interrupting the run with a ctrl-C."""
         from trollflow2.launcher import Runner
-        with mock.patch('trollflow2.launcher.yaml.load'),\
-                mock.patch('trollflow2.launcher.open'),\
+        with mock.patch('trollflow2.launcher.yaml.load'), \
+                mock.patch('trollflow2.launcher.open'), \
                 mock.patch('trollflow2.launcher.ListenerContainer') as lc_:
             listener = mock.MagicMock()
             get = mock.Mock()