ansible: Patch more aggressively in unit tests

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/test/task/test_ansible.py b/teuthology/test/task/test_ansible.py
index 09131c32e123ee77bc21abc5e27497a0b19d99db..117ea4abfac4fd368a26e5afa2e381da633fc850 100644 (file)
--- a/teuthology/test/task/test_ansible.py
+++ b/teuthology/test/task/test_ansible.py
@@ -27,6 +27,29 @@ class TestAnsibleTask(TestTask):
         self.ctx.cluster.add(Remote('user@remote2'), ['role2'])
         self.ctx.config = dict()
         self.task_config = dict(playbook=[])
+        self.start_patchers()
+
+    def start_patchers(self):
+        m_NTF = Mock()
+        m_file = Mock()
+        m_file.name = 'file_name'
+        m_NTF.return_value = m_file
+        self.patcher_NTF = patch(
+            'teuthology.task.ceph_ansible.ansible.NamedTemporaryFile',
+            m_NTF,
+        )
+        self.patcher_NTF.start()
+        self.patcher_os_remove = patch(
+            'teuthology.task.ceph_ansible.ansible.os.remove',
+        )
+        self.patcher_os_remove.start()
+
+    def teardown(self):
+        self.stop_patchers()
+
+    def stop_patchers(self):
+        self.patcher_NTF.stop()
+        self.patcher_os_remove.stop()
 
     def test_setup(self):
         self.task_config.update(dict(
@@ -275,9 +298,14 @@ class TestAnsibleTask(TestTask):
         task = self.klass(self.ctx, self.task_config)
         task.setup()
         with patch.object(ansible.pexpect, 'run') as m_run:
-            m_run.return_value = ('', 1)
-            with raises(CommandFailedError):
-                task.execute_playbook()
+            with patch('teuthology.task.ansible.open') as m_open:
+                fake_failure_log = Mock()
+                fake_failure_log.__enter__ = Mock()
+                fake_failure_log.__exit__ = Mock()
+                m_open.return_value = fake_failure_log
+                m_run.return_value = ('', 1)
+                with raises(CommandFailedError):
+                    task.execute_playbook()
 
     def test_build_args_no_tags(self):
         self.task_config.update(dict(
@@ -442,7 +470,6 @@ class TestCephLabTask(TestTask):
             task.get_playbook()
         assert task.playbook_file.name == playbook
 
-
     def test_generate_hosts_file(self):
         self.task_config.update(dict(
             playbook=[]