X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f2cb2d2f14c8509b7e06126fefead0da282ef2fd..609646134bcd8fc3a7fd500848220741ecc4a9d2:/services/nodemanager/tests/test_failure.py diff --git a/services/nodemanager/tests/test_failure.py b/services/nodemanager/tests/test_failure.py index f543f645f6..dea7230dd3 100644 --- a/services/nodemanager/tests/test_failure.py +++ b/services/nodemanager/tests/test_failure.py @@ -32,24 +32,24 @@ class BogusActor(arvnodeman.baseactor.BaseNodeManagerActor): class ActorUnhandledExceptionTest(unittest.TestCase): def test_fatal_error(self): for e in (MemoryError(), threading.ThreadError(), OSError(errno.ENOMEM, "")): - with mock.patch('os.killpg') as killpg_mock: + with mock.patch('os.kill') as kill_mock: act = BogusActor.start(e).tell_proxy() act.doStuff() act.actor_ref.stop(block=True) - self.assertTrue(killpg_mock.called) + self.assertTrue(kill_mock.called) - @mock.patch('os.killpg') - def test_nonfatal_error(self, killpg_mock): + @mock.patch('os.kill') + def test_nonfatal_error(self, kill_mock): act = BogusActor.start(OSError(errno.ENOENT, "")).tell_proxy() act.doStuff() act.actor_ref.stop(block=True) - self.assertFalse(killpg_mock.called) + self.assertFalse(kill_mock.called) class WatchdogActorTest(unittest.TestCase): - @mock.patch('os.killpg') - def test_time_timout(self, killpg_mock): + @mock.patch('os.kill') + def test_time_timout(self, kill_mock): act = BogusActor.start(OSError(errno.ENOENT, "")) watch = arvnodeman.baseactor.WatchdogActor.start(1, act) watch.stop(block=True) act.stop(block=True) - self.assertTrue(killpg_mock.called) + self.assertTrue(kill_mock.called)