diff options
| author | Valerii Ponomarov <vponomar@redhat.com> | 2019-03-21 16:04:57 +0530 |
|---|---|---|
| committer | Valerii Ponomarov <vponomar@redhat.com> | 2019-04-11 16:48:36 +0530 |
| commit | 5fe05c3d09126453423a3d2ee97a4586ec6592c1 (patch) | |
| tree | cc8d28f20c2e6fc29d172bae2744f66a62d1b336 /tests/functional/heketi | |
| parent | 6497ec872180781c4131e7e2f901c1f84a9f5853 (diff) | |
Add py3 support to our tox config and fix several incompatibilities
Required steps to run test cases using py3:
1) Install py3
2) Install 'tox' package using "pip3"
3) Run test cases using tox package installed via pip3
Note that full py3 support is not tested yet. It only allows you to run
it on py3 not providing any guarantees.
Example:
$ python3 -m tox -e functional3 -- \
glusto -c /path/to/the/config/file.yaml \
'--pytest=-v -rsx tests -k test_glusterblock_logs'
Change-Id: I610faac0b75364c401734b6f892649893ca2320e
Diffstat (limited to 'tests/functional/heketi')
4 files changed, 19 insertions, 9 deletions
diff --git a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py index 04bce628..8a3beb29 100644 --- a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py +++ b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py @@ -24,8 +24,8 @@ class TestHeketiVolume(BaseClass): def setUp(self): super(TestHeketiVolume, self).setUp() - self.master_node = g.config['ocp_servers']['master'].keys()[0] - self.gluster_node = g.config["gluster_servers"].keys()[0] + self.master_node = list(g.config['ocp_servers']['master'].keys())[0] + self.gluster_node = list(g.config["gluster_servers"].keys())[0] def _get_free_space(self): """Get free space in each heketi device""" diff --git a/tests/functional/heketi/test_heketi_device_operations.py b/tests/functional/heketi/test_heketi_device_operations.py index bec1d01f..76736ecf 100644 --- a/tests/functional/heketi/test_heketi_device_operations.py +++ b/tests/functional/heketi/test_heketi_device_operations.py @@ -1,4 +1,9 @@ -import json +try: + # py2/3 + import simplejson as json +except ImportError: + # py2 + import json import ddt from glusto.core import Glusto as g diff --git a/tests/functional/heketi/test_node_enable_disable.py b/tests/functional/heketi/test_node_enable_disable.py index dcd2f7b4..e1e416fc 100644 --- a/tests/functional/heketi/test_node_enable_disable.py +++ b/tests/functional/heketi/test_node_enable_disable.py @@ -1,5 +1,10 @@ """Test cases to disable and enable node in heketi.""" -import json +try: + # py2/3 + import simplejson as json +except ImportError: + # py2 + import json from glusto.core import Glusto as g diff --git a/tests/functional/heketi/test_volume_multi_req.py b/tests/functional/heketi/test_volume_multi_req.py index 3445a8a4..9fcaeb49 100644 --- a/tests/functional/heketi/test_volume_multi_req.py +++ b/tests/functional/heketi/test_volume_multi_req.py @@ -219,7 +219,7 @@ class TestVolumeMultiReq(BaseClass): 'wait for volume count to settle timed out') def _count_vols(self): - ocp_node = g.config['ocp_servers']['master'].keys()[0] + ocp_node = list(g.config['ocp_servers']['master'].keys())[0] return len(_heketi_vols(ocp_node, self.heketi_server_url)) def test_simple_serial_vol_create(self): @@ -229,7 +229,7 @@ class TestVolumeMultiReq(BaseClass): # TODO A nice thing to add to this test would be to also verify # the gluster volumes also exist. tname = make_unique_label(extract_method_name(self.id())) - ocp_node = g.config['ocp_servers']['master'].keys()[0] + ocp_node = list(g.config['ocp_servers']['master'].keys())[0] # deploy a temporary storage class sc = build_storage_class( name=tname, @@ -290,7 +290,7 @@ class TestVolumeMultiReq(BaseClass): """ self.addCleanup(self.wait_to_settle) tname = make_unique_label(extract_method_name(self.id())) - ocp_node = g.config['ocp_servers']['master'].keys()[0] + ocp_node = list(g.config['ocp_servers']['master'].keys())[0] # deploy a temporary storage class sc = build_storage_class( name=tname, @@ -345,7 +345,7 @@ class TestVolumeMultiReq(BaseClass): """ self.addCleanup(self.wait_to_settle) tname = make_unique_label(extract_method_name(self.id())) - ocp_node = g.config['ocp_servers']['master'].keys()[0] + ocp_node = list(g.config['ocp_servers']['master'].keys())[0] # deploy a temporary storage class sc = build_storage_class( name=tname, @@ -389,7 +389,7 @@ class TestVolumeMultiReq(BaseClass): """ self.addCleanup(self.wait_to_settle) tname = make_unique_label(extract_method_name(self.id())) - ocp_node = g.config['ocp_servers']['master'].keys()[0] + ocp_node = list(g.config['ocp_servers']['master'].keys())[0] # deploy a temporary storage class sc = build_storage_class( name=tname, |