commit 0720fc354922cffbcb91663d85fe0cc0393ab0ba
author Zuul <zuul@review.opendev.org> Tue Jan 26 20:32:40 2021 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 26 20:32:40 2021 +0000
tree 15c032ec1561e2f507264dbc39d1ce37d94e10c4
parent f2340dbfd2d7289e85acd8172255cde49eade9c7
parent 9ddff80a5b27f09af7961f9bb6a121cae4126ad4

Merge "Enable running multi-backends tests with different share protocols"

manila_tempest_tests/tests/api/admin/test_share_group_types.py

diff --git a/manila_tempest_tests/tests/api/admin/test_share_group_types.py b/manila_tempest_tests/tests/api/admin/test_share_group_types.py
index eb62838..89d43fa 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_group_types.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_group_types.py
@@ -60,7 +60,7 @@
     @decorators.idempotent_id('e2ba1754-cecc-4178-ad39-eefbb59e4d6d')
     @tc.attr(base.TAG_POSITIVE, base.TAG_API)
     @ddt.data(
-        *itertools.product(('id', 'name'), set(
+        *itertools.product(('id', 'name'), utils.deduplicate(
             [LATEST_MICROVERSION, constants.MIN_SHARE_GROUP_MICROVERSION,
              constants.SHARE_GROUPS_GRADUATION_VERSION])))
     @ddt.unpack

manila_tempest_tests/tests/api/test_quotas.py

diff --git a/manila_tempest_tests/tests/api/test_quotas.py b/manila_tempest_tests/tests/api/test_quotas.py
index 64d734f..52d54ea 100644
--- a/manila_tempest_tests/tests/api/test_quotas.py
+++ b/manila_tempest_tests/tests/api/test_quotas.py
@@ -92,7 +92,7 @@
             self.assertGreater(int(quotas["replica_gigabytes"]), -2)
 
     @ddt.data(
-        *itertools.product(set(
+        *itertools.product(utils.deduplicate(
             ["2.25", "2.53", CONF.share.max_api_microversion]), (True, False))
     )
     @ddt.unpack

manila_tempest_tests/tests/api/test_rules.py

diff --git a/manila_tempest_tests/tests/api/test_rules.py b/manila_tempest_tests/tests/api/test_rules.py
index 37f9250..15bd7ae 100644
--- a/manila_tempest_tests/tests/api/test_rules.py
+++ b/manila_tempest_tests/tests/api/test_rules.py
@@ -495,7 +495,7 @@
     @decorators.idempotent_id('4e636fd2-26ef-4b63-96eb-77860a8b6cdf')
     @tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
     @ddt.data(*itertools.product(
-        set(['2.13', '2.27', '2.28', LATEST_MICROVERSION]),
+        utils.deduplicate(['2.13', '2.27', '2.28', LATEST_MICROVERSION]),
         ("alice", "alice_bob", "alice bob"),
         ('rw', 'ro')))
     @ddt.unpack