[ARVADOS] updated: 40103b455d0df2bc47eaba422a72bf6ec4fd6808

[git at public.curoverse.com]

Summary of changes:
 .../nodemanager/arvnodeman/computenode/__init__.py | 61 ++++++++++++++++++++
 .../arvnodeman/computenode/dispatch/__init__.py    | 65 ++++++----------------
 .../arvnodeman/computenode/dispatch/slurm.py       |  7 ++-
 .../arvnodeman/computenode/driver/__init__.py      | 18 +++++-
 services/nodemanager/arvnodeman/launcher.py        |  2 +-
 services/nodemanager/tests/testutil.py             |  8 +++
 6 files changed, 105 insertions(+), 56 deletions(-)

       via  40103b455d0df2bc47eaba422a72bf6ec4fd6808 (commit)
       via  7b4f98f54598aefc54f88a491dba64793cf749ae (commit)
       via  b445db93ece1069c949f0c02d0564e578e453d12 (commit)
       via  85c71a36173550f14fb1d5f4092f2050ec8dc033 (commit)
       via  9aa6066eef7a67809f33871447d4312af6f22749 (commit)
      from  179b6580522095c6e190bd000c71002fc6564a2e (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 40103b455d0df2bc47eaba422a72bf6ec4fd6808
Merge: 179b658 7b4f98f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 2 10:55:58 2016 -0500

    Merge branch '8206-gce-retry-init' closes #8206


commit 7b4f98f54598aefc54f88a491dba64793cf749ae
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 2 10:55:39 2016 -0500

    8206: Mock time.sleep() to avoid unnecessary delay in test.

diff --git a/services/nodemanager/tests/testutil.py b/services/nodemanager/tests/testutil.py
index b266ed6..6cde766 100644
--- a/services/nodemanager/tests/testutil.py
+++ b/services/nodemanager/tests/testutil.py
@@ -131,12 +131,13 @@ class DriverTestMixin(object):
         return getattr(self.driver_mock(), method_name).call_args
 
     def test_driver_create_retry(self):
-        driver_mock2 = mock.MagicMock(name='driver_mock2')
-        self.driver_mock.side_effect = (Exception("oops"), driver_mock2)
-        kwargs = {'user_id': 'foo'}
-        driver = self.new_driver(auth_kwargs=kwargs)
-        self.assertTrue(self.driver_mock.called)
-        self.assertIs(driver.real, driver_mock2)
+        with mock.patch('time.sleep'):
+            driver_mock2 = mock.MagicMock(name='driver_mock2')
+            self.driver_mock.side_effect = (Exception("oops"), driver_mock2)
+            kwargs = {'user_id': 'foo'}
+            driver = self.new_driver(auth_kwargs=kwargs)
+            self.assertTrue(self.driver_mock.called)
+            self.assertIs(driver.real, driver_mock2)
 
 class RemotePollLoopActorTestMixin(ActorTestMixin):
     def build_monitor(self, *args, **kwargs):

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


hooks/post-receive
--