Merge branch '13076-r-autogen-api'

[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 59fc503128aef69be02a6a45aabf86f80fde6540..ce96a8040d83a9a091d2d3331bec1d4275d4a974 100644 (file)
--- a/services/nodemanager/tests/test_computenode_driver_azure.py
+++ b/services/nodemanager/tests/test_computenode_driver_azure.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 from __future__ import absolute_import, print_function
 
@@ -69,19 +72,6 @@ class AzureComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase
         node.extra = {'tags': {"hostname": name}}
         self.assertEqual(name, azure.ComputeNodeDriver.node_fqdn(node))
 
-    def test_cloud_exceptions(self):
-        for error in [Exception("test exception"),
-                      IOError("test exception"),
-                      ssl.SSLError("test exception"),
-                      cloud_types.LibcloudError("test exception")]:
-            self.assertTrue(azure.ComputeNodeDriver.is_cloud_exception(error),
-                            "{} not flagged as cloud exception".format(error))
-
-    def test_noncloud_exceptions(self):
-        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)
@@ -119,7 +109,7 @@ echo z1.test > /var/tmp/arv-node-data/meta-data/instance-type
         self.driver_mock().list_nodes.return_value = nodelist
         n = driver.list_nodes()
         self.assertEqual(nodelist, n)
-        self.driver_mock().list_nodes.assert_called_with(ex_fetch_nic=False, ex_resource_group='TestResourceGroup')
+        self.driver_mock().list_nodes.assert_called_with(ex_fetch_nic=False, ex_fetch_power_state=False, ex_resource_group='TestResourceGroup')
 
     def test_create_can_find_node_after_timeout(self):
         super(AzureComputeNodeDriverTestCase,
@@ -130,7 +120,7 @@ echo z1.test > /var/tmp/arv-node-data/meta-data/instance-type
     def test_node_found_after_timeout_has_fixed_size(self):
         size = testutil.MockSize(4)
         node_props = {'hardwareProfile': {'vmSize': size.id}}
-        cloud_node = testutil.cloud_node_mock(
-            size=None, tags={'arvados-class': 'test'}, properties=node_props)
+        cloud_node = testutil.cloud_node_mock(tags={'arvados-class': 'test'}, properties=node_props)
+        cloud_node.size = None
         self.check_node_found_after_timeout_has_fixed_size(
             size, cloud_node, {'tag_arvados-class': 'test'})