projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d2ef4ee8dd4e221118'
[arvados.git]
/
services
/
nodemanager
/
tests
/
test_failure.py
diff --git
a/services/nodemanager/tests/test_failure.py
b/services/nodemanager/tests/test_failure.py
index 2d1a17eaecd82a7cea0be0103d27fc2e8f07c4c5..8bf3ea87412200a595d70d02c34796f75a2a8543 100644
(file)
--- a/
services/nodemanager/tests/test_failure.py
+++ b/
services/nodemanager/tests/test_failure.py
@@
-48,9
+48,12
@@
class ActorUnhandledExceptionTest(testutil.ActorTestMixin, unittest.TestCase):
def test_nonfatal_error(self):
status.tracker.update({'actor_exceptions': 0})
kill_mock = mock.Mock('os.kill')
def test_nonfatal_error(self):
status.tracker.update({'actor_exceptions': 0})
kill_mock = mock.Mock('os.kill')
- act = BogusActor.start(OSError(errno.ENOENT, ""), killfunc=kill_mock).tell_proxy()
+ bgact = BogusActor.start(OSError(errno.ENOENT, ""), killfunc=kill_mock)
+ act_thread = bgact.proxy().get_thread().get()
+ act = bgact.tell_proxy()
act.doStuff()
act.actor_ref.stop(block=True)
act.doStuff()
act.actor_ref.stop(block=True)
+ act_thread.join()
self.assertFalse(kill_mock.called)
self.assertEqual(1, status.tracker.get('actor_exceptions'))
self.assertFalse(kill_mock.called)
self.assertEqual(1, status.tracker.get('actor_exceptions'))