Cleanup strategy tests broken by new forking strategy

test/units/plugins/strategies/test_strategy_base.py

@@ -24,8 +24,11 @@ from ansible.compat.tests.mock import patch, MagicMock
 
 from ansible.errors import AnsibleError, AnsibleParserError
 from ansible.plugins.strategy import StrategyBase
+from ansible.executor.process.worker import WorkerProcess
 from ansible.executor.task_queue_manager import TaskQueueManager
 from ansible.executor.task_result import TaskResult
+from ansible.playbook.handler import Handler
+from ansible.inventory.host import Host
 
 from six.moves import queue as Queue
 from units.mock.loader import DictDataLoader
@@ -98,37 +101,44 @@ class TestStrategyBase(unittest.TestCase):
         mock_tqm._unreachable_hosts = ["host02"]
         self.assertEqual(strategy_base.get_hosts_remaining(play=mock_play), mock_hosts[2:])
 
-    def test_strategy_base_queue_task(self):
+    @patch.object(WorkerProcess, 'run')
+    def test_strategy_base_queue_task(self, mock_worker):
+        def fake_run(self):
+            return
+
+        mock_worker.run.side_effect = fake_run
+
         fake_loader = DictDataLoader()
+        mock_var_manager = MagicMock()
+        mock_host = MagicMock()
+        mock_inventory = MagicMock()
+        mock_options = MagicMock()
+        mock_options.module_path = None
         
-        workers = []
+        tqm = TaskQueueManager(
-        for i in range(0, 3):
+            inventory=mock_inventory,
-            worker_main_q = MagicMock()
+            variable_manager=mock_var_manager,
-            worker_main_q.put.return_value = None
+            loader=fake_loader,
-            worker_result_q = MagicMock()
+            options=mock_options,
-            workers.append([i, worker_main_q, worker_result_q])
+            passwords=None,
+        )
+        tqm._initialize_processes(3)
+        tqm.hostvars = dict()
 
-        mock_tqm = MagicMock()
+        try:
-        mock_tqm._final_q = MagicMock()
+            strategy_base = StrategyBase(tqm=tqm)
-        mock_tqm.get_workers.return_value = workers
+            strategy_base._queue_task(host=mock_host, task=MagicMock(), task_vars=dict(), play_context=MagicMock())
-        mock_tqm.get_loader.return_value = fake_loader
-
-        strategy_base = StrategyBase(tqm=mock_tqm)
-        strategy_base._cur_worker = 0
-        strategy_base._pending_results = 0
-        strategy_base._queue_task(host=MagicMock(), task=MagicMock(), task_vars=dict(), play_context=MagicMock())
             self.assertEqual(strategy_base._cur_worker, 1)
             self.assertEqual(strategy_base._pending_results, 1)
-        strategy_base._queue_task(host=MagicMock(), task=MagicMock(), task_vars=dict(), play_context=MagicMock())
+            strategy_base._queue_task(host=mock_host, task=MagicMock(), task_vars=dict(), play_context=MagicMock())
             self.assertEqual(strategy_base._cur_worker, 2)
             self.assertEqual(strategy_base._pending_results, 2)
-        strategy_base._queue_task(host=MagicMock(), task=MagicMock(), task_vars=dict(), play_context=MagicMock())
+            strategy_base._queue_task(host=mock_host, task=MagicMock(), task_vars=dict(), play_context=MagicMock())
             self.assertEqual(strategy_base._cur_worker, 0)
             self.assertEqual(strategy_base._pending_results, 3)
-        workers[0][1].put.side_effect = EOFError
+        finally:
-        strategy_base._queue_task(host=MagicMock(), task=MagicMock(), task_vars=dict(), play_context=MagicMock())
+            tqm.cleanup()
-        self.assertEqual(strategy_base._cur_worker, 1)
+        
-        self.assertEqual(strategy_base._pending_results, 3)
 
     def test_strategy_base_process_pending_results(self):
         mock_tqm = MagicMock()
@@ -156,6 +166,7 @@ class TestStrategyBase(unittest.TestCase):
         
         mock_iterator = MagicMock()
         mock_iterator.mark_host_failed.return_value = None
+        mock_iterator.get_next_task_for_host.return_value = (None, None)
 
         mock_host = MagicMock()
         mock_host.name = 'test01'
@@ -315,22 +326,15 @@ class TestStrategyBase(unittest.TestCase):
         res = strategy_base._load_included_file(included_file=mock_inc_file, iterator=mock_iterator)
         self.assertEqual(res, [])
 
-    def test_strategy_base_run_handlers(self):
+    @patch.object(WorkerProcess, 'run')
-        workers = []
+    def test_strategy_base_run_handlers(self, mock_worker):
-        for i in range(0, 3):
+        def fake_run(*args):
-            worker_main_q = MagicMock()
+            return
-            worker_main_q.put.return_value = None
+        mock_worker.side_effect = fake_run
-            worker_result_q = MagicMock()
-            workers.append([i, worker_main_q, worker_result_q])
-
-        mock_tqm = MagicMock()
-        mock_tqm._final_q = MagicMock()
-        mock_tqm.get_workers.return_value = workers
-        mock_tqm.send_callback.return_value = None
-
         mock_play_context = MagicMock()
 
-        mock_handler_task = MagicMock()
+        mock_handler_task = MagicMock(Handler)
+        mock_handler_task.action = 'foo'
         mock_handler_task.get_name.return_value = "test handler"
         mock_handler_task.has_triggered.return_value = False
 
@@ -341,11 +345,9 @@ class TestStrategyBase(unittest.TestCase):
         mock_play = MagicMock()
         mock_play.handlers = [mock_handler]
 
-        mock_host = MagicMock()
+        mock_host = MagicMock(Host)
         mock_host.name = "test01"
 
-        mock_iterator = MagicMock()
-
         mock_inventory = MagicMock()
         mock_inventory.get_hosts.return_value = [mock_host]
 
@@ -355,8 +357,31 @@ class TestStrategyBase(unittest.TestCase):
         mock_iterator = MagicMock
         mock_iterator._play = mock_play
 
-        strategy_base = StrategyBase(tqm=mock_tqm)
+        fake_loader = DictDataLoader()
+        mock_options = MagicMock()
+        mock_options.module_path = None
+
+        tqm = TaskQueueManager(
+            inventory=mock_inventory,
+            variable_manager=mock_var_mgr,
+            loader=fake_loader,
+            options=mock_options,
+            passwords=None,
+        )
+        tqm._initialize_processes(3)
+        tqm.hostvars = dict()
+
+        try:
+            strategy_base = StrategyBase(tqm=tqm)
+
             strategy_base._inventory = mock_inventory
             strategy_base._notified_handlers = {"test handler": [mock_host]}
 
+            mock_return_task = MagicMock(Handler)
+            mock_return_host = MagicMock(Host)
+            task_result = TaskResult(mock_return_host, mock_return_task, dict(changed=False))
+            tqm._final_q.put(('host_task_ok', task_result))
+
             result = strategy_base.run_handlers(iterator=mock_iterator, play_context=mock_play_context)
+        finally:
+            tqm.cleanup()