summaryrefslogtreecommitdiffstats
path: root/tests/functional/provisioning
diff options
context:
space:
mode:
authorvamahaja <vamahaja@redhat.com>2020-09-17 09:32:15 +0530
committervamahaja <vamahaja@redhat.com>2020-10-12 16:45:43 +0530
commitd0604ca7d194a8f158096850ac931d5f5a0b8529 (patch)
tree4e2410878cd9853d66c2ff9e1ba3bd28c147ca91 /tests/functional/provisioning
parentf56bb3920cb501d0fafa583bc851c1e7dda4aa30 (diff)
[TestFix][Tier2] Update pytest marker for 'tier2' tests
Change-Id: I5db480da820c82b7b15f90ed70a4f60643079cb0 Signed-off-by: vamahaja <vamahaja@redhat.com>
Diffstat (limited to 'tests/functional/provisioning')
-rwxr-xr-xtests/functional/provisioning/test_dynamic_provisioning_block.py8
-rw-r--r--tests/functional/provisioning/test_dynamic_provisioning_file.py4
-rw-r--r--tests/functional/provisioning/test_pv_resize.py8
-rw-r--r--tests/functional/provisioning/test_storage_class_cases.py12
4 files changed, 16 insertions, 16 deletions
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_block.py b/tests/functional/provisioning/test_dynamic_provisioning_block.py
index cce553b0..215354da 100755
--- a/tests/functional/provisioning/test_dynamic_provisioning_block.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_block.py
@@ -118,7 +118,7 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
"""
self.dynamic_provisioning_glusterblock(set_hacount=True)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_dynamic_provisioning_glusterblock_hacount_false(self):
"""Validate storage-class mandatory parameters for block
"""
@@ -255,7 +255,7 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
ret, out, err = async_io.async_communicate()
self.assertEqual(ret, 0, "IO %s failed on %s" % (io_cmd, self.node))
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_glusterblock_logs_presence_verification(self):
"""Validate presence of glusterblock provisioner POD and it's status"""
@@ -549,7 +549,7 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
# create a block pvc greater than default BHV size
self.create_and_wait_for_pvc(pvc_size=(default_bhv_size + 1))
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_expansion_of_block_hosting_volume_using_heketi(self):
"""Verify that after expanding block hosting volume we are able to
consume the expanded space"""
@@ -839,7 +839,7 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
" No. of BHV after the test : {}".format(len(bhv_list), bhv_post))
self.assertEqual(bhv_post, (len(bhv_list) + 2), err_msg)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_100gb_block_pvc_create_and_delete_twice(self):
"""Validate creation and deletion of blockvoume of size 100GB"""
# Define required space, bhv size required for on 100GB block PVC
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_file.py b/tests/functional/provisioning/test_dynamic_provisioning_file.py
index c711186c..c1f9d078 100644
--- a/tests/functional/provisioning/test_dynamic_provisioning_file.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_file.py
@@ -114,7 +114,7 @@ class TestDynamicProvisioningP0(BaseClass):
g.log.info("test_dynamic_provisioning_glusterfile")
self.dynamic_provisioning_glusterfile(False)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_dynamic_provisioning_glusterfile_volname_prefix(self):
"""Validate dynamic provisioning for gluster file with vol name prefix
"""
@@ -481,7 +481,7 @@ class TestDynamicProvisioningP0(BaseClass):
oc_delete(self.node, 'pv', pv_name)
wait_for_resource_absence(self.node, 'pv', pv_name)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_usage_of_default_storage_class(self):
"""Validate PVs creation for SC with default custom volname prefix"""
diff --git a/tests/functional/provisioning/test_pv_resize.py b/tests/functional/provisioning/test_pv_resize.py
index abadc4ee..a7baca00 100644
--- a/tests/functional/provisioning/test_pv_resize.py
+++ b/tests/functional/provisioning/test_pv_resize.py
@@ -50,7 +50,7 @@ class TestPvResizeClass(BaseClass):
g.log.error(msg)
raise self.skipTest(msg)
- @pytest.mark.tier1
+ @pytest.mark.tier2
@ddt.data(
(True, True),
(False, True),
@@ -258,7 +258,7 @@ class TestPvResizeClass(BaseClass):
"""Validate PVC resize when resized by exact available free space"""
self._pv_resize(exceed_free_space=False)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_pv_resize_try_shrink_pv_size(self):
"""Validate whether reducing the PV size is allowed"""
dir_path = "/mnt/"
@@ -295,7 +295,7 @@ class TestPvResizeClass(BaseClass):
self.assertEqual(
ret, 0, "Failed to execute command %s on %s" % (cmd, node))
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_pv_resize_when_heketi_down(self):
"""Create a PVC and try to expand it when heketi is down, It should
fail. After heketi is up, expand PVC should work.
@@ -418,7 +418,7 @@ class TestPvResizeClass(BaseClass):
resize_pvc(self.ocp_master_node[0], pvc_name, available_size_gb)
verify_pvc_size(self.ocp_master_node[0], pvc_name, available_size_gb)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_pv_resize_device_disabled(self):
"""Validate resize after disabling all devices except one"""
h_node, h_url = self.heketi_client_node, self.heketi_server_url
diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py
index 05ee49cc..3a2b9dfa 100644
--- a/tests/functional/provisioning/test_storage_class_cases.py
+++ b/tests/functional/provisioning/test_storage_class_cases.py
@@ -181,7 +181,7 @@ class TestStorageClassCases(BaseClass):
validate_multipath_pod(
self.ocp_master_node[0], pod_name, hacount, list(mpaths)[0])
- @pytest.mark.tier1
+ @pytest.mark.tier2
@ddt.data(
{"volumetype": "dist-rep:3"},
{"resturl": "http://10.0.0.1:8080"},
@@ -195,7 +195,7 @@ class TestStorageClassCases(BaseClass):
"""Validate glusterfile storage with different incorrect parameters"""
self.create_sc_with_parameter("glusterfile", parameter=parameter)
- @pytest.mark.tier1
+ @pytest.mark.tier2
@ddt.data(
{"resturl": "http://10.0.0.1:8080"},
{"restsecretname": "fakerestsecretname",
@@ -331,7 +331,7 @@ class TestStorageClassCases(BaseClass):
"Invalid chapauthenabled value '%s'" % chapauthenabled
)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_create_and_verify_pvc_with_volume_name_prefix(self):
"""create and verify pvc with volname prefix on an app pod"""
if get_openshift_version() < "3.9":
@@ -358,7 +358,7 @@ class TestStorageClassCases(BaseClass):
"Failed to read Endpoints of %s on %s " % (
pv_name, self.ocp_master_node[0]))
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_try_to_create_sc_with_duplicated_name(self):
"""Verify SC creation fails with duplicate name"""
sc_name = "test-sc-duplicated-name-" + utils.get_random_str()
@@ -367,7 +367,7 @@ class TestStorageClassCases(BaseClass):
with self.assertRaises(AssertionError):
self.create_storage_class(sc_name=sc_name)
- @pytest.mark.tier1
+ @pytest.mark.tier2
@ddt.data('secretName', 'secretNamespace', None)
def test_sc_glusterfile_missing_parameter(self, parameter):
"""Validate glusterfile storage with missing parameters"""
@@ -397,7 +397,7 @@ class TestStorageClassCases(BaseClass):
with self.assertRaises(ExecutionError):
verify_pvc_status_is_bound(node, pvc_name, timeout=1)
- @pytest.mark.tier1
+ @pytest.mark.tier2
def test_sc_create_with_clusterid(self):
"""Create storage class with 'cluster id'"""
h_cluster_list = heketi_cluster_list(