summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pytest.ini1
-rw-r--r--tests/functional/heketi/test_heketi_node_operations.py2
-rw-r--r--tests/functional/heketi/test_restart_heketi_pod.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/pytest.ini b/pytest.ini
index ac64f0f..20ec383 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
[pytest]
+junit_family=legacy
markers =
tier0: Tier0 functional test cases
tier1: Tier1 functional test cases
diff --git a/tests/functional/heketi/test_heketi_node_operations.py b/tests/functional/heketi/test_heketi_node_operations.py
index 1f5e2b0..387bfae 100644
--- a/tests/functional/heketi/test_heketi_node_operations.py
+++ b/tests/functional/heketi/test_heketi_node_operations.py
@@ -680,7 +680,7 @@ class TestHeketiNodeOperations(baseclass.BaseClass):
for vol in vol_list:
vol_info = h.heketi_volume_expand(
h_node, h_url, vol['id'], '1', json=True)
- self.assertEquals(2, vol_info['size'])
+ self.assertEqual(2, vol_info['size'])
else:
msg = "Invalid vol_operation %s" % vol_operation
diff --git a/tests/functional/heketi/test_restart_heketi_pod.py b/tests/functional/heketi/test_restart_heketi_pod.py
index a6c973e..d88080c 100644
--- a/tests/functional/heketi/test_restart_heketi_pod.py
+++ b/tests/functional/heketi/test_restart_heketi_pod.py
@@ -93,7 +93,7 @@ class TestRestartHeketi(BaseClass):
# Read Heketi secret data
self.node = self.ocp_master_node[0]
heketi_secret_data_str_base64 = oc_get_custom_resource(
- self.node, "secret", ":.data.'heketi\.json'", # noqa
+ self.node, "secret", r":.data.'heketi\.json'", # noqa
name=heketi_secret_name)[0]
heketi_secret_data_str = self.cmd_run(
"echo %s | base64 -d" % heketi_secret_data_str_base64)