7661: added test with only_pdh (not working yet)

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

diff --git a/services/nodemanager/tests/test_computenode_driver_azure.py b/services/nodemanager/tests/test_computenode_driver_azure.py
index 3b7cca278dee130a82b2b04f8a705984b339f368..90fea0c80441a960fce6e5ad669790cd4aa08158 100644 (file)
--- a/services/nodemanager/tests/test_computenode_driver_azure.py
+++ b/services/nodemanager/tests/test_computenode_driver_azure.py
@@ -26,23 +26,20 @@ class AzureComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase
         self.assertEqual(kwargs, self.driver_mock.call_args[1])
 
     def test_create_image_loaded_at_initialization(self):
-        list_method = self.driver_mock().list_images
-        list_method.return_value = [testutil.cloud_object_mock(c)
-                                    for c in 'abc']
+        get_method = self.driver_mock().get_image
+        get_method.return_value = testutil.cloud_object_mock('id_b')
         driver = self.new_driver(create_kwargs={'image': 'id_b'})
-        self.assertEqual(1, list_method.call_count)
+        self.assertEqual(1, get_method.call_count)
 
-    def test_create_includes_ping_and_hostname(self):
+    def test_create_includes_ping(self):
         arv_node = testutil.arvados_node_mock(info={'ping_secret': 'ssshh'})
+        arv_node["hostname"] = None
         driver = self.new_driver()
         driver.create_node(testutil.MockSize(1), arv_node)
         create_method = self.driver_mock().create_node
         self.assertTrue(create_method.called)
-        print(create_method.call_args[1])
         self.assertIn('ping_secret=ssshh',
                       create_method.call_args[1].get('ex_tags', {}).get('arv-ping-url', ""))
-        self.assertEqual('compute99.zzzzz.arvadosapi.com',
-                      create_method.call_args[1].get('ex_tags', {}).get('hostname', ""))
 
     def test_name_from_new_arvados_node(self):
         arv_node = testutil.arvados_node_mock(hostname=None)
@@ -82,3 +79,11 @@ class AzureComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase
         self.assertFalse(
             azure.ComputeNodeDriver.is_cloud_exception(ValueError("test error")),
             "ValueError flagged as cloud exception")
+
+    def test_sync_node(self):
+        arv_node = testutil.arvados_node_mock(1)
+        cloud_node = testutil.cloud_node_mock(2)
+        driver = self.new_driver()
+        driver.sync_node(cloud_node, arv_node)
+        self.check_node_tagged(cloud_node,
+                               {'hostname': 'compute1.zzzzz.arvadosapi.com'})