Merge branch '8697-ruby187-compat'

[arvados.git] / services / nodemanager / tests / test_computenode_dispatch_slurm.py

diff --git a/services/nodemanager/tests/test_computenode_dispatch_slurm.py b/services/nodemanager/tests/test_computenode_dispatch_slurm.py
index 6358623380cdcf7b404e9afc9477b0894b9c2932..92858b6e991c1f458407e799a20d75d165f66ec8 100644 (file)
--- a/services/nodemanager/tests/test_computenode_dispatch_slurm.py
+++ b/services/nodemanager/tests/test_computenode_dispatch_slurm.py
@@ -60,19 +60,27 @@ class SLURMComputeNodeShutdownActorTestCase(ComputeNodeShutdownActorMixin,
         self.check_success_flag(True)
         self.assertFalse(proc_mock.called)
 
-    # def test_node_undrained_when_shutdown_window_closes(self, proc_mock):
-    #     proc_mock.side_effect = iter(['drng\n', 'idle\n'])
-    #     self.make_mocks(arvados_node=testutil.arvados_node_mock(job_uuid=True))
-    #     self.make_actor()
-    #     self.check_success_flag(False, 2)
-    #     self.check_slurm_got_args(proc_mock, 'NodeName=compute99', 'State=RESUME')
-
-    # def test_alloc_node_undrained_when_shutdown_window_closes(self, proc_mock):
-    #     proc_mock.side_effect = iter(['alloc\n'])
-    #     self.make_mocks(arvados_node=testutil.arvados_node_mock(job_uuid=True))
-    #     self.make_actor()
-    #     self.check_success_flag(False, 2)
-    #     self.check_slurm_got_args(proc_mock, 'sinfo', '--noheader', '-o', '%t', '-n', 'compute99')
+    def test_node_undrained_when_shutdown_cancelled(self, proc_mock):
+        try:
+            proc_mock.side_effect = iter(['drng\n', 'idle\n'])
+            self.make_mocks(arvados_node=testutil.arvados_node_mock(job_uuid=True))
+            self.make_actor()
+            self.shutdown_actor.cancel_shutdown("test")
+            self.check_success_flag(False, 2)
+            self.check_slurm_got_args(proc_mock, 'NodeName=compute99', 'State=RESUME')
+        finally:
+            self.shutdown_actor.actor_ref.stop()
+
+    def test_alloc_node_undrained_when_shutdown_cancelled(self, proc_mock):
+        try:
+            proc_mock.side_effect = iter(['alloc\n'])
+            self.make_mocks(arvados_node=testutil.arvados_node_mock(job_uuid=True))
+            self.make_actor()
+            self.shutdown_actor.cancel_shutdown("test")
+            self.check_success_flag(False, 2)
+            self.check_slurm_got_args(proc_mock, 'sinfo', '--noheader', '-o', '%t', '-n', 'compute99')
+        finally:
+            self.shutdown_actor.actor_ref.stop()
 
     def test_cancel_shutdown_retry(self, proc_mock):
         proc_mock.side_effect = iter([OSError, 'drain\n', OSError, 'idle\n', 'idle\n'])