]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Used unpatched os.kill with test_basic in test_exit.py
authorShubham Mishra <smishra99.iitkgp@gmail.com>
Thu, 21 May 2020 13:49:17 +0000 (19:19 +0530)
committerKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 14:19:20 +0000 (22:19 +0800)
Signed-off-by: Shubham Mishra <smishra99.iitkgp@gmail.com>
teuthology/test/test_exit.py

index b688b5216e3f6282eefa2ba85ca2dcc3c04caae7..61c7a59758efd1c81ba0cee669f1c14271a7f26b 100644 (file)
@@ -22,6 +22,7 @@ class TestExiter(object):
             wraps=os.kill,
         )
 
+        self.kill_unpatched = os.kill
         self.m_kill = self.patcher_kill.start()
 
         def m_kill_unwrap(pid, sig):
@@ -47,9 +48,9 @@ class TestExiter(object):
         m_func = Mock()
         obj.add_handler(sig, m_func)
         assert len(obj.handlers) == 1
-        os.kill(self.pid, sig)
+        self.kill_unpatched(self.pid, sig)
         assert m_func.call_count == 1
-        assert self.m_kill.call_count == 2
+        assert self.m_kill.call_count == 1
         for arg_list in self.m_kill.call_args_list:
             assert arg_list[0] == (self.pid, sig)
 
@@ -66,8 +67,8 @@ class TestExiter(object):
         for handler in handlers:
             handler.remove()
         assert obj.handlers == list()
-        os.kill(self.pid, send_sig)
-        assert self.m_kill.call_count == 2
+        self.kill_unpatched(self.pid, send_sig)
+        assert self.m_kill.call_count == 1
         for handler in handlers:
             assert handler.func.call_count == 0
 
@@ -82,10 +83,10 @@ class TestExiter(object):
             m_func = Mock(name="handler %s" % i)
             handlers.append(obj.add_handler(sig, m_func))
         assert obj.handlers == handlers
-        os.kill(self.pid, send_sig)
+        self.kill_unpatched(self.pid, send_sig)
         for i in range(n):
             assert handlers[i].func.call_count == 1
-        assert self.m_kill.call_count == 2
+        assert self.m_kill.call_count == 1
         for arg_list in self.m_kill.call_args_list:
             assert arg_list[0] == (self.pid, send_sig)