From b774119c3e87a65de7c3f3a6c08b51704224cb90 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 18 Feb 2020 10:42:18 -0800 Subject: [PATCH 1/4] Added included_test_flag check for non v2v tests --- cfme/utils/providers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cfme/utils/providers.py b/cfme/utils/providers.py index b6bed4e5e2..a75485817e 100644 --- a/cfme/utils/providers.py +++ b/cfme/utils/providers.py @@ -127,7 +127,15 @@ def _filter_required_tags(self, provider): def _filter_required_flags(self, provider): """ Filters by required yaml flags """ + included_flags = provider.data.get('included_test_flags', '') + if isinstance(included_flags, str): + included_flags = included_flags.split(',') + included_flags = [flag.strip() for flag in included_flags] + if self.required_flags is None: + if included_flags.__contains__("v2v"): + # Non v2v tests should not run for v2v providers + return False return None if self.required_flags: test_flags = [flag.strip() for flag in self.required_flags] From 05c832279abb572c56b5028dde8da92d39a0dccc Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 18 Feb 2020 11:07:06 -0800 Subject: [PATCH 2/4] Added required_test_flag check for non v2v tests --- cfme/utils/providers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cfme/utils/providers.py b/cfme/utils/providers.py index a75485817e..f8782d0d74 100644 --- a/cfme/utils/providers.py +++ b/cfme/utils/providers.py @@ -127,14 +127,14 @@ def _filter_required_tags(self, provider): def _filter_required_flags(self, provider): """ Filters by required yaml flags """ - included_flags = provider.data.get('included_test_flags', '') - if isinstance(included_flags, str): - included_flags = included_flags.split(',') - included_flags = [flag.strip() for flag in included_flags] + required_test_flags = provider.data.get('required_test_flags', '') + if isinstance(required_test_flags, str): + required_test_flags = required_test_flags.split(',') + required_test_flags = [flag.strip() for flag in required_test_flags] if self.required_flags is None: - if included_flags.__contains__("v2v"): - # Non v2v tests should not run for v2v providers + if required_test_flags: + # Providers with required_test_flags should have required_flag in tests return False return None if self.required_flags: From 71086783bf307b9628f3e55f2b1405e074525073 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Mon, 24 Feb 2020 12:58:24 -0800 Subject: [PATCH 3/4] Added required_test_flags: v2v for v2v providers --- cfme/utils/providers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfme/utils/providers.py b/cfme/utils/providers.py index f8782d0d74..72dc6de0a8 100644 --- a/cfme/utils/providers.py +++ b/cfme/utils/providers.py @@ -133,7 +133,7 @@ def _filter_required_flags(self, provider): required_test_flags = [flag.strip() for flag in required_test_flags] if self.required_flags is None: - if required_test_flags: + if required_test_flags is None: # Providers with required_test_flags should have required_flag in tests return False return None From 2512e5911d810ded82d3a1628c268a4c461e0559 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Fri, 28 Feb 2020 10:29:34 -0800 Subject: [PATCH 4/4] Added required_test_flags: v2v for v2v providers --- cfme/utils/providers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cfme/utils/providers.py b/cfme/utils/providers.py index 72dc6de0a8..c58880bc7c 100644 --- a/cfme/utils/providers.py +++ b/cfme/utils/providers.py @@ -133,8 +133,11 @@ def _filter_required_flags(self, provider): required_test_flags = [flag.strip() for flag in required_test_flags] if self.required_flags is None: - if required_test_flags is None: - # Providers with required_test_flags should have required_flag in tests + if required_test_flags == ['']: + # Providers with no required_test_flags should not be filtered + return True + else: + # Providers with required_test_flags should be filtered like v2v return False return None if self.required_flags: