conftest: stop using a test parameter for hosts

Hosts can also now be specified also using severeal args, like
`--hosts A,B --hosts C`

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

conftest.py

@@ -1,3 +1,4 @@
+import itertools
 import logging
 import pytest
 import tempfile
@@ -103,10 +104,14 @@ def setup_host(hostname_or_ip):
     return h
 
 @pytest.fixture(scope='session')
-def hosts(request):
+def hosts(pytestconfig):
     # a list of master hosts, each from a different pool
-    hostname_list = request.param.split(',')
+    hosts_args = pytestconfig.getoption("hosts")
+    hosts_split = [hostlist.split(',') for hostlist in hosts_args]
+    hostname_list = list(itertools.chain(*hosts_split))
     host_list = [setup_host(hostname_or_ip) for hostname_or_ip in hostname_list]
+    if not host_list:
+        pytest.fail("This test requires at least one --hosts parameter")
     yield host_list
 
 @pytest.fixture(scope='session')
@@ -430,8 +435,6 @@ def second_network(request, host):
     return network_uuid
 
 def pytest_generate_tests(metafunc):
-    if "hosts" in metafunc.fixturenames:
-        metafunc.parametrize("hosts", metafunc.config.getoption("hosts"), indirect=True, scope="session")
     if "vm_ref" in metafunc.fixturenames:
         vms = metafunc.config.getoption("vm")
         if not vms:

tests/storage/nfs/test_nfs_sr.py

@@ -20,7 +20,7 @@ def test_create_and_destroy_sr(self, host, dispatch_nfs):
         sr.destroy(verify=True)
 
 # Make sure these fixtures are called before the parametrized one
-@pytest.mark.usefixtures('sr_device_config', 'hosts')
+@pytest.mark.usefixtures('sr_device_config')
 class TestNFSSR:
     @pytest.mark.quicktest
     @pytest.mark.parametrize('dispatch_nfs', ['nfs_sr', 'nfs4_sr'], indirect=True)

tests/storage/nfs/test_nfs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 @pytest.mark.big_vm # and ideally with a big VM to test it scales
 @pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 # Make sure these fixtures are called before the parametrized one
-@pytest.mark.usefixtures('sr_device_config', 'vm_ref', 'hosts')
+@pytest.mark.usefixtures('sr_device_config', 'vm_ref')
 class Test:
     @pytest.mark.parametrize('dispatch_nfs', ['vm_on_nfs_sr', 'vm_on_nfs4_sr'], indirect=True)
     def test_cold_crosspool_migration(self, host, hostB1, dispatch_nfs, local_sr_on_hostB1):

tests/storage/nfs/test_nfs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 @pytest.mark.big_vm # and ideally with a big VM to test it scales
 @pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 # Make sure these fixtures are called before the parametrized one
-@pytest.mark.usefixtures('sr_device_config', 'vm_ref', 'hosts')
+@pytest.mark.usefixtures('sr_device_config', 'vm_ref')
 class Test:
     @pytest.mark.parametrize('dispatch_nfs', ['vm_on_nfs_sr', 'vm_on_nfs4_sr'], indirect=True)
     def test_live_intrapool_shared_migration(self, host, hostA2, dispatch_nfs):