X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eaf140d67206316dc5e0e4c1f99969e7ecaac5b6..1dd4997ebfe9e1bce4073aed9abb37f89ae90845:/services/nodemanager/tests/test_computenode_driver.py diff --git a/services/nodemanager/tests/test_computenode_driver.py b/services/nodemanager/tests/test_computenode_driver.py index b191330b72..4bf4c39efb 100644 --- a/services/nodemanager/tests/test_computenode_driver.py +++ b/services/nodemanager/tests/test_computenode_driver.py @@ -72,7 +72,7 @@ class ComputeNodeDriverTestCase(unittest.TestCase): def test_create_node_only_cloud_errors_are_counted(self): - status.tracker.update({'cloud_errors': 0}) + status.tracker.update({'create_node_errors': 0}) errors = [(config.CLOUD_ERRORS[0], True), (KeyError, False)] self.driver_mock().list_images.return_value = [] driver = self.TestBaseComputeNodeDriver({}, {}, {}, self.driver_mock) @@ -80,13 +80,13 @@ class ComputeNodeDriverTestCase(unittest.TestCase): for an_error, is_cloud_error in errors: self.driver_mock().create_node.side_effect = an_error with self.assertRaises(an_error): - driver.create_node('1', 'id_1') + driver.create_node(testutil.MockSize(1), 'id_1') if is_cloud_error: error_count += 1 - self.assertEqual(error_count, status.tracker.get('cloud_errors')) + self.assertEqual(error_count, status.tracker.get('create_node_errors')) def test_list_nodes_only_cloud_errors_are_counted(self): - status.tracker.update({'cloud_errors': 0}) + status.tracker.update({'list_nodes_errors': 0}) errors = [(config.CLOUD_ERRORS[0], True), (KeyError, False)] driver = self.TestBaseComputeNodeDriver({}, {}, {}, self.driver_mock) error_count = 0 @@ -96,10 +96,10 @@ class ComputeNodeDriverTestCase(unittest.TestCase): driver.list_nodes() if is_cloud_error: error_count += 1 - self.assertEqual(error_count, status.tracker.get('cloud_errors')) + self.assertEqual(error_count, status.tracker.get('list_nodes_errors')) def test_destroy_node_only_cloud_errors_are_counted(self): - status.tracker.update({'cloud_errors': 0}) + status.tracker.update({'destroy_node_errors': 0}) errors = [(config.CLOUD_ERRORS[0], True), (KeyError, False)] self.driver_mock().list_nodes.return_value = [testutil.MockSize(1)] driver = self.TestBaseComputeNodeDriver({}, {}, {}, self.driver_mock) @@ -110,4 +110,4 @@ class ComputeNodeDriverTestCase(unittest.TestCase): driver.destroy_node(testutil.MockSize(1)) if is_cloud_error: error_count += 1 - self.assertEqual(error_count, status.tracker.get('cloud_errors')) + self.assertEqual(error_count, status.tracker.get('destroy_node_errors'))