projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16263: Rename no_federation -> bypass_federation
[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 ef4423dafaf7762b5d8a8c95fdbaacf630156917..8bf3ea87412200a595d70d02c34796f75a2a8543 100644
(file)
--- a/
services/nodemanager/tests/test_failure.py
+++ b/
services/nodemanager/tests/test_failure.py
@@
-17,6
+17,7
@@
import pykka
from . import testutil
import arvnodeman.baseactor
from . import testutil
import arvnodeman.baseactor
+import arvnodeman.status as status
class BogusActor(arvnodeman.baseactor.BaseNodeManagerActor):
def __init__(self, e, killfunc=None):
class BogusActor(arvnodeman.baseactor.BaseNodeManagerActor):
def __init__(self, e, killfunc=None):
@@
-45,11
+46,16
@@
class ActorUnhandledExceptionTest(testutil.ActorTestMixin, unittest.TestCase):
self.assertTrue(kill_mock.called)
def test_nonfatal_error(self):
self.assertTrue(kill_mock.called)
def test_nonfatal_error(self):
+ status.tracker.update({'actor_exceptions': 0})
kill_mock = mock.Mock('os.kill')
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.assertFalse(kill_mock.called)
+ self.assertEqual(1, status.tracker.get('actor_exceptions'))
class WatchdogActorTest(testutil.ActorTestMixin, unittest.TestCase):
class WatchdogActorTest(testutil.ActorTestMixin, unittest.TestCase):