[ARVADOS] updated: b720184c408dee0e3e9bbafb424bd736703be172

[Git user]

Summary of changes:
 services/nodemanager/tests/test_daemon.py | 1 +
 services/nodemanager/tests/testutil.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  b720184c408dee0e3e9bbafb424bd736703be172 (commit)
      from  d43df73d4429ddd4c00c7ff47e10f9f2595d30b0 (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 b720184c408dee0e3e9bbafb424bd736703be172
Author: radhika <radhika at curoverse.com>
Date:   Tue Mar 15 16:23:58 2016 -0400

    8561: test tweaks

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 554fb88..9c2f885 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -59,6 +59,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
         self.cloud_factory().node_start_time.return_value = time.time()
         self.cloud_updates = mock.MagicMock(name='updates_mock')
         self.timer = testutil.MockTimer(deliver_immediately=False)
+        self.cloud_factory().node_id.return_value = '2'
 
         self.node_setup = mock.MagicMock(name='setup_mock')
         self.node_setup.start.side_effect = self.mock_node_start
diff --git a/services/nodemanager/tests/testutil.py b/services/nodemanager/tests/testutil.py
index 5803b05..b9e2ce3 100644
--- a/services/nodemanager/tests/testutil.py
+++ b/services/nodemanager/tests/testutil.py
@@ -31,7 +31,7 @@ def arvados_node_mock(node_num=99, job_uuid=None, age=-1, **kwargs):
             'job_uuid': job_uuid,
             'crunch_worker_state': crunch_worker_state,
             'properties': {},
-            'info': {'ping_secret': 'defaulttestsecret'}}
+            'info': {'ping_secret': 'defaulttestsecret', 'ec2_instance_id': '2'}}
     node.update(kwargs)
     return node
 

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


hooks/post-receive
--