Merge branch '11545-stress-test' closes #11545
[arvados.git] / services / nodemanager / tests / testutil.py
index df8c7c7d79d90e39ebe0d4ee8b9d89f319e06c15..6e134375bb8aec05bdd71f830e28f277d3cff5b5 100644 (file)
@@ -123,7 +123,10 @@ class ActorTestMixin(object):
         pykka.ActorRegistry.stop_all()
 
     def stop_proxy(self, proxy):
-        return proxy.actor_ref.stop(timeout=self.TIMEOUT)
+        th = proxy.get_thread().get()
+        t = proxy.actor_ref.stop(timeout=self.TIMEOUT)
+        th.join()
+        return t
 
     def wait_for_assignment(self, proxy, attr_name, unassigned=None,
                             timeout=TIMEOUT):