commit 2f24b8233d240f9bb2a94204aa0a981a8ddb8731
author Jenkins <jenkins@review.openstack.org> Tue Jan 31 11:17:39 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 31 11:17:39 2017 +0000
tree 65574d4381f5c879c7a038fa12a7e0c83eb165ed
parent 63ef1387d14cbd69cf47303de21ae8afe7c77824
parent db32f4600979e91bf727d55b3776c571c393e1f0

Merge "Add access-rules tests to improve the coverage"

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 a6bda73..532e773 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
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ddt
 from tempest import config
 from tempest.lib.common.utils import data_utils
 import testtools
@@ -27,6 +28,7 @@
 @testtools.skipUnless(
     CONF.share.run_share_group_tests, 'Share Group tests disabled.')
 @base.skip_if_microversion_lt(constants.MIN_SHARE_GROUP_MICROVERSION)
+@ddt.ddt
 class ShareGroupTypesTest(base.BaseSharesAdminTest):
 
     @classmethod
@@ -44,13 +46,14 @@
         cls.share_type2 = share_type['share_type']
 
     @tc.attr(base.TAG_POSITIVE, base.TAG_API)
-    def test_create_get_delete_share_group_type_min(self):
+    @ddt.data('id', 'name')
+    def test_create_get_delete_share_group_type_min(self, st_key):
         name = data_utils.rand_name("tempest-manila")
 
         # Create share group type
         sg_type_c = self.create_share_group_type(
             name=name,
-            share_types=self.share_type['id'],
+            share_types=self.share_type[st_key],
             cleanup_in_class=False,
             version=constants.MIN_SHARE_GROUP_MICROVERSION)
 
@@ -76,12 +79,13 @@
             share_group_type_id=sg_type_r['id'])
 
     @tc.attr(base.TAG_POSITIVE, base.TAG_API)
-    def test_create_share_group_type_multiple_share_types_min(self):
+    @ddt.data('id', 'name')
+    def test_create_share_group_type_multiple_share_types_min(self, st_key):
         name = data_utils.rand_name("tempest-manila")
 
         sg_type = self.create_share_group_type(
             name=name,
-            share_types=[self.share_type['id'], self.share_type2['id']],
+            share_types=[self.share_type[st_key], self.share_type2[st_key]],
             cleanup_in_class=False,
             version=constants.MIN_SHARE_GROUP_MICROVERSION)
 

manila_tempest_tests/tests/api/admin/test_share_group_types_negative.py

diff --git a/manila_tempest_tests/tests/api/admin/test_share_group_types_negative.py b/manila_tempest_tests/tests/api/admin/test_share_group_types_negative.py
index e7f6824..18e8cdd 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_group_types_negative.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_group_types_negative.py
@@ -40,10 +40,19 @@
             client=cls.admin_shares_v2_client)
 
     @tc.attr(base.TAG_NEGATIVE, base.TAG_API)
-    def test_create_share_ggroup_with_nonexistent_share_type(self):
+    def test_create_share_group_type_without_name(self):
         self.assertRaises(
             lib_exc.BadRequest,
             self.admin_shares_v2_client.create_share_group_type,
+            name=None,
+            share_types=data_utils.rand_name("fake"))
+
+    @tc.attr(base.TAG_NEGATIVE, base.TAG_API)
+    def test_create_share_group_type_with_nonexistent_share_type(self):
+        self.assertRaises(
+            lib_exc.NotFound,
+            self.admin_shares_v2_client.create_share_group_type,
+            name=data_utils.rand_name("sgt_name_should_have_not_been_created"),
             share_types=data_utils.rand_name("fake"))
 
     @tc.attr(base.TAG_NEGATIVE, base.TAG_API)