X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eaf140d67206316dc5e0e4c1f99969e7ecaac5b6..91e6b4f16baa92a234007fd7442976cf2340a7cc:/services/nodemanager/tests/test_failure.py

diff --git a/services/nodemanager/tests/test_failure.py b/services/nodemanager/tests/test_failure.py
index 2d1a17eaec..8bf3ea8741 100644
--- 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')
-        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_thread.join()
         self.assertFalse(kill_mock.called)
         self.assertEqual(1, status.tracker.get('actor_exceptions'))