From a766d8e426f1ac58f18098a273868c19afe18ba1 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 20 Jul 2022 06:59:04 -0700 Subject: [PATCH] Swap maintenance fix to cleanup step Follow-up to I89839ecb0e08555ddcfee0289350fac1923b3958 to use a cleanup step so the maintenance state is rolled back regardless. Change-Id: I52a5c36d8ca1965d866409fee4590cc1d151f238 --- ironic_tempest_plugin/tests/api/admin/test_nodes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodes.py b/ironic_tempest_plugin/tests/api/admin/test_nodes.py index 65344666..6d26a264 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_nodes.py +++ b/ironic_tempest_plugin/tests/api/admin/test_nodes.py @@ -911,13 +911,13 @@ class TestNodeProtected(base.BaseBaremetalTest): self.deploy_node(self.node['uuid']) self.client.update_node(self.node['uuid'], protected=True, maintenance=True) - + # undo maintenance because we can't teardown something + # in maintenance. + self.addCleanup(self.client.update_node, self.node['uuid'], + maintenance=False) self.assertRaises(lib_exc.Forbidden, self.client.delete_node, self.node['uuid']) - # undo maintenance because we can't teardown something - # in maintenance. - self.client.update_node(self.node['uuid'], maintenance=False) @decorators.attr(type='negative') @decorators.idempotent_id('1c819f4c-6c1d-4150-ba4a-3b0dcb3c8694')