diff --git a/cfme/tests/configure/test_rest_access_control.py b/cfme/tests/configure/test_rest_access_control.py index 5da0be87bc..c09668805f 100644 --- a/cfme/tests/configure/test_rest_access_control.py +++ b/cfme/tests/configure/test_rest_access_control.py @@ -872,7 +872,6 @@ def test_delete_users_from_collection(self, users): "User Settings", "All VM and Instance Access Rules", "Main Configuration", - "Red Hat Cloud", ] FEATURES_510 = COMMON_FEATURES + [ diff --git a/cfme/tests/infrastructure/test_config_management_rest.py b/cfme/tests/infrastructure/test_config_management_rest.py index f4ff15274d..5cca6ea3b5 100644 --- a/cfme/tests/infrastructure/test_config_management_rest.py +++ b/cfme/tests/infrastructure/test_config_management_rest.py @@ -215,6 +215,9 @@ def test_authentications_options(self, appliance): assert_response(appliance) +# Keep this a function scoped fixture, otherwise it will fail for parametrized tests +# where one something destructive is performed on the config_manager_ob by one of the tests. +# e.g. test_config_manager_delete_rest @pytest.fixture def config_manager_rest(provider): """Creates provider using REST API.""" diff --git a/cfme/tests/webui/test_rest.py b/cfme/tests/webui/test_rest.py index db215b02b3..6567e2bf82 100644 --- a/cfme/tests/webui/test_rest.py +++ b/cfme/tests/webui/test_rest.py @@ -2,12 +2,18 @@ import pytest from cfme import test_requirements +from cfme.infrastructure.provider import InfraProvider +from cfme.markers.env_markers.provider import ONE from cfme.utils.appliance.implementations.ui import navigate_to from cfme.utils.rest import delete_resources_from_collection from cfme.utils.rest import delete_resources_from_detail -pytestmark = [test_requirements.rest] +pytestmark = [ + test_requirements.rest, + pytest.mark.provider([InfraProvider], selector=ONE, scope="module"), + pytest.mark.usefixtures('setup_provider'), +] @pytest.fixture(params=[True, False], ids=["global", "local"])