From db35c7dd96e41d2084f77ccfe783b52375d8d0aa Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 10 Feb 2023 08:47:04 +0100 Subject: [PATCH] smoke test: fix test_deploy_vm_extra_config_data.py on kvm --- .../smoke/test_deploy_vm_extra_config_data.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/test/integration/smoke/test_deploy_vm_extra_config_data.py b/test/integration/smoke/test_deploy_vm_extra_config_data.py index 80b046102ca9..1ea0505603d1 100644 --- a/test/integration/smoke/test_deploy_vm_extra_config_data.py +++ b/test/integration/smoke/test_deploy_vm_extra_config_data.py @@ -74,7 +74,7 @@ def setUpClass(cls): cls.services["service_offerings"]["small"] ) - cls.cleanup = [ + cls._cleanup = [ cls.account, cls.service_offering ] @@ -83,14 +83,9 @@ def setUpClass(cls): @classmethod def tearDownClass(cls): - try: - cls.apiclient = super(TestAddConfigtoDeployVM, cls).getClsTestClient().getApiClient() - cls.reset_hosts_hugepages() - # Clean up, terminate the created templates - cleanup_resources(cls.apiclient, cls.cleanup) + super(TestAddConfigtoDeployVM, cls).tearDownClass() - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) + cls.reset_hosts_hugepages() @classmethod def set_hosts_hugepages(cls):