4138: updated unit test
authorTim Pierce <twp@curoverse.com>
Fri, 23 Jan 2015 22:44:41 +0000 (17:44 -0500)
committerBrett Smith <brett@curoverse.com>
Mon, 16 Feb 2015 16:12:32 +0000 (11:12 -0500)
Corrected test_create_includes_ping_secret to account for delivering the
ping secret via metadata in GCE.

services/nodemanager/tests/test_computenode_driver_gce.py

index 075760ab7d8469edc63ad6eaad57b90cc6a118b8..0e10e2f84e3f3958e9bbaa7968d56550d9a53bc0 100644 (file)
@@ -42,9 +42,10 @@ class GCEComputeNodeDriverTestCase(unittest.TestCase):
         driver.create_node(testutil.MockSize(1), arv_node)
         create_method = self.driver_mock().create_node
         self.assertTrue(create_method.called)
+        create_metadata = create_method.call_args[1].get('ex_metadata')
+        self.assertIsInstance(create_metadata, dict)
         self.assertIn('ping_secret=ssshh',
-                      create_method.call_args[1].get('ex_userdata',
-                                                     'arg missing'))
+                      create_metadata.get('pingUrl', 'arg missing'))
 
     def test_generate_metadata_for_new_arvados_node(self):
         arv_node = testutil.arvados_node_mock(8)