[ARVADOS] updated: 9bcdc4d79859742c44e09e606cbcdd64c7377e5f

[Git user]

Summary of changes:
 services/nodemanager/setup.py                                 | 2 +-
 services/nodemanager/tests/test_computenode_dispatch.py       | 2 +-
 services/nodemanager/tests/test_computenode_dispatch_slurm.py | 2 +-
 services/nodemanager/tests/test_jobqueue.py                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

       via  9bcdc4d79859742c44e09e606cbcdd64c7377e5f (commit)
      from  acd3d380bb636ca7ef324e0903e54e309b132dc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9bcdc4d79859742c44e09e606cbcdd64c7377e5f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 2 14:26:24 2017 -0400

    11925: Update dependency on arvados-python-client to fix
    test_unsatisfiable_jobs test.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curoverse.com>

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 59d95e3..d083bf1 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -33,7 +33,7 @@ setup(name='arvados-node-manager',
       ],
       install_requires=[
           'apache-libcloud>=0.20',
-          'arvados-python-client>=0.1.20150206225333',
+          'arvados-python-client>=0.1.20170731145219',
           'future',
           'pykka',
           'python-daemon',
diff --git a/services/nodemanager/tests/test_computenode_dispatch.py b/services/nodemanager/tests/test_computenode_dispatch.py
index afd37ee..13ddf56 100644
--- a/services/nodemanager/tests/test_computenode_dispatch.py
+++ b/services/nodemanager/tests/test_computenode_dispatch.py
@@ -241,7 +241,7 @@ class ComputeNodeShutdownActorMixin(testutil.ActorTestMixin):
         self.cloud_client.destroy_node.return_value = False
         self.make_actor(cancellable=True)
         self.shutdown_actor.cancel_shutdown("test")
-        self.shutdown_actor.ping()
+        self.shutdown_actor.ping().get(self.TIMEOUT)
         self.check_success_flag(False, 2)
         self.assertFalse(self.arvados_client.nodes().update.called)
 
diff --git a/services/nodemanager/tests/test_computenode_dispatch_slurm.py b/services/nodemanager/tests/test_computenode_dispatch_slurm.py
index d00425e..5c929f4 100644
--- a/services/nodemanager/tests/test_computenode_dispatch_slurm.py
+++ b/services/nodemanager/tests/test_computenode_dispatch_slurm.py
@@ -80,7 +80,7 @@ class SLURMComputeNodeShutdownActorTestCase(ComputeNodeShutdownActorMixin,
             self.make_mocks(arvados_node=testutil.arvados_node_mock(job_uuid=True))
             self.timer = testutil.MockTimer(False)
             self.make_actor()
-            self.shutdown_actor.ping()
+            self.shutdown_actor.ping().get(self.TIMEOUT)
             self.busywait(lambda: proc_mock.call_args is not None)
             self.shutdown_actor.cancel_shutdown("test")
             self.check_success_flag(False, 2)
diff --git a/services/nodemanager/tests/test_jobqueue.py b/services/nodemanager/tests/test_jobqueue.py
index 669b624..b1d5e00 100644
--- a/services/nodemanager/tests/test_jobqueue.py
+++ b/services/nodemanager/tests/test_jobqueue.py
@@ -157,7 +157,6 @@ class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin,
     @mock.patch("subprocess.check_call")
     @mock.patch("subprocess.check_output")
     def test_unsatisfiable_jobs(self, mock_squeue, mock_scancel):
-        #mock_scancel.return_value = ""
         job_uuid = 'zzzzz-8i9sb-zzzzzzzzzzzzzzz'
         container_uuid = 'yyyyy-dz642-yyyyyyyyyyyyyyy'
         mock_squeue.return_value = "1|1024|0|Resources|" + container_uuid + "\n"
@@ -165,6 +164,7 @@ class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin,
         self.build_monitor([{'items': [{'uuid': job_uuid}]}],
                            self.MockCalculatorUnsatisfiableJobs(), True, True)
         self.monitor.subscribe(self.subscriber).get(self.TIMEOUT)
+        self.monitor.ping().get(self.TIMEOUT)
         self.stop_proxy(self.monitor)
         self.client.jobs().cancel.assert_called_with(uuid=job_uuid)
         mock_scancel.assert_called_with(['scancel', '--name='+container_uuid])

-----------------------------------------------------------------------


hooks/post-receive
--