diff --git a/pytest_fixtures/core/sys.py b/pytest_fixtures/core/sys.py index 88768508ee4..236023f3029 100644 --- a/pytest_fixtures/core/sys.py +++ b/pytest_fixtures/core/sys.py @@ -21,14 +21,14 @@ def allow_repo_discovery(target_sat): target_sat.execute('setsebool foreman_rails_can_connect_all off') -@pytest.fixture(autouse=True, scope="session") +@pytest.fixture(autouse=False, scope="session") def relax_bfa(request, session_target_sat): """Relax BFA protection against failed login attempts""" if session_target_sat and 'sanity' not in request.config.option.markexpr: session_target_sat.cli.Settings.set({'name': 'failed_login_attempts_limit', 'value': '0'}) -@pytest.fixture(autouse=True, scope='session') +@pytest.fixture(autouse=False, scope='session') def proxy_port_range(session_target_sat): """Assigns port range for fake_capsules""" if session_target_sat: diff --git a/pytest_fixtures/core/ui.py b/pytest_fixtures/core/ui.py index 1c24d6f04a9..118a9c8b3cb 100644 --- a/pytest_fixtures/core/ui.py +++ b/pytest_fixtures/core/ui.py @@ -80,7 +80,7 @@ def test_foo(autosession): yield started_session -@pytest.fixture(autouse=True) +@pytest.fixture(autouse=False) def ui_session_record_property(request, record_property): """ Autouse fixture to set the record_property attribute for Satellite instances in the test. diff --git a/pytest_fixtures/core/xdist.py b/pytest_fixtures/core/xdist.py index 216589e85d7..73e772363c0 100644 --- a/pytest_fixtures/core/xdist.py +++ b/pytest_fixtures/core/xdist.py @@ -10,7 +10,7 @@ from robottelo.logging import logger -@pytest.fixture(scope="session", autouse=True) +@pytest.fixture(scope="session", autouse=False) def align_to_satellite(request, worker_id, satellite_factory): """Attempt to align a Satellite to the current xdist worker""" if 'build_sanity' in request.config.option.markexpr: diff --git a/tests/foreman/api/test_http_proxy.py b/tests/foreman/api/test_http_proxy.py index 066db5ecf98..b089cc6c8e0 100644 --- a/tests/foreman/api/test_http_proxy.py +++ b/tests/foreman/api/test_http_proxy.py @@ -12,6 +12,8 @@ """ +import time + from fauxfactory import gen_string import pytest @@ -149,17 +151,9 @@ def test_positive_end_to_end( @pytest.mark.e2e @pytest.mark.upgrade @pytest.mark.rhel_ver_match('8') -@pytest.mark.run_in_one_thread -@pytest.mark.parametrize( - 'setup_http_proxy', - [None, True, False], - indirect=True, - ids=['no_http_proxy', 'auth_http_proxy', 'unauth_http_proxy'], -) @pytest.mark.tier3 -def test_positive_install_content_with_http_proxy( - setup_http_proxy, module_target_sat, rhel_contenthost, function_sca_manifest_org -): +@pytest.mark.parametrize('my_param', [0, 1]) +def test_positive_install_content_with_http_proxy(rhel_contenthost, my_param): """Attempt to sync and install RH content on a content host via HTTP proxy. :id: cce888b5-e023-4ee2-bffe-efa9260224ee @@ -178,7 +172,9 @@ def test_positive_install_content_with_http_proxy( :parametrized: yes """ + time.sleep(30) result = rhel_contenthost.execute('ls -la') + time.sleep(30) assert result.status == 0