From 6ae782b1c117c649bbd25f7282ccaf7ab41c5f86 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 10 Sep 2019 08:51:38 +0200 Subject: [PATCH] Skip the manual cleaning test if software RAID testing is enabled Software RAID testing covers manual cleaning, so there is no point in having a separate test for it running at the same time. Change-Id: I4115f9ee6490a3f7e7f2e6c7b5d37ab582e6153f --- .../tests/scenario/ironic_standalone/test_cleaning.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py index 7df98ce..eb0d4d2 100644 --- a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py +++ b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py @@ -65,6 +65,12 @@ class BaremetalCleaningIpmiWholedisk( deploy_interface = 'iscsi' api_microversion = '1.31' + @classmethod + def skip_checks(cls): + super(BaremetalCleaningIpmiWholedisk, cls).skip_checks() + if CONF.baremetal_feature_enabled.software_raid: + raise cls.skipException("Cleaning is covered in the RAID test") + @decorators.idempotent_id('065238db-1b6d-4d75-a9da-c240f8cbd956') @utils.services('image', 'network') def test_manual_cleaning(self):