Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.15.z] Fix pytest deprecation warning #14280

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pytest_fixtures/component/host.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ def module_model():
return entities.Model().create()


@pytest.mark.skip_if_not_set('clients', 'fake_manifest')
@pytest.fixture(scope="module")
def setup_rhst_repo(module_target_sat):
"""Prepare Satellite tools repository for usage in specified organization"""
Expand Down
2 changes: 0 additions & 2 deletions pytest_fixtures/component/puppet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Puppet Environment fixtures
import pytest

from robottelo.config import settings
from robottelo.constants import ENVIRONMENT


Expand Down Expand Up @@ -55,7 +54,6 @@ def module_puppet_environment(module_puppet_org, module_puppet_loc, session_pupp
return session_puppet_enabled_sat.api.Environment(id=environment.id).read()


@pytest.mark.skipif((not settings.robottelo.repos_hosting_url), reason='Missing repos_hosting_url')
@pytest.fixture(scope='module')
def module_import_puppet_module(session_puppet_enabled_sat):
"""Returns custom puppet environment name that contains imported puppet module
Expand Down
8 changes: 0 additions & 8 deletions pytest_fixtures/component/satellite_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ def enable_external_auth_rhsso(
default_sso_host.set_the_redirect_uri()


@pytest.mark.external_auth
@pytest.fixture(scope='module')
def module_enroll_idm_and_configure_external_auth(module_target_sat):
ipa_host = IPAHost(module_target_sat)
Expand All @@ -343,7 +342,6 @@ def module_enroll_idm_and_configure_external_auth(module_target_sat):
ipa_host.disenroll_idm()


@pytest.mark.external_auth
@pytest.fixture
def func_enroll_idm_and_configure_external_auth(target_sat):
ipa_host = IPAHost(target_sat)
Expand Down Expand Up @@ -410,19 +408,16 @@ def rhsso_setting_setup_with_timeout(module_target_sat, rhsso_setting_setup):
setting_entity.update({'value'})


@pytest.mark.external_auth
@pytest.fixture(scope='module')
def module_enroll_ad_and_configure_external_auth(ad_data, module_target_sat):
module_target_sat.enroll_ad_and_configure_external_auth(ad_data)


@pytest.mark.external_auth
@pytest.fixture
def func_enroll_ad_and_configure_external_auth(ad_data, target_sat):
target_sat.enroll_ad_and_configure_external_auth(ad_data)


@pytest.mark.external_auth
@pytest.fixture
def configure_hammer_no_creds(parametrized_enrolled_sat):
"""Configures hammer to use sessions and negotiate auth."""
Expand All @@ -433,7 +428,6 @@ def configure_hammer_no_creds(parametrized_enrolled_sat):
parametrized_enrolled_sat.execute(f'mv -f {HAMMER_CONFIG}.backup {HAMMER_CONFIG}')


@pytest.mark.external_auth
@pytest.fixture
def configure_hammer_negotiate(parametrized_enrolled_sat, configure_hammer_no_creds):
"""Configures hammer to use sessions and negotiate auth."""
Expand All @@ -448,7 +442,6 @@ def configure_hammer_negotiate(parametrized_enrolled_sat, configure_hammer_no_cr
parametrized_enrolled_sat.execute(f'mv -f {HAMMER_CONFIG}.backup {HAMMER_CONFIG}')


@pytest.mark.external_auth
@pytest.fixture
def configure_hammer_no_negotiate(parametrized_enrolled_sat):
"""Configures hammer not to use automatic negotiation."""
Expand All @@ -458,7 +451,6 @@ def configure_hammer_no_negotiate(parametrized_enrolled_sat):
parametrized_enrolled_sat.execute(f'mv -f {HAMMER_CONFIG}.backup {HAMMER_CONFIG}')


@pytest.mark.external_auth
@pytest.fixture
def hammer_logout(parametrized_enrolled_sat):
"""Logout in Hammer."""
Expand Down
7 changes: 0 additions & 7 deletions tests/foreman/api/test_contentview.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,6 @@ def test_negative_create_with_invalid_name(self, name, target_sat):
class TestContentViewPublishPromote:
"""Tests for publishing and promoting content views."""

@pytest.mark.skipif(
(not settings.robottelo.REPOS_HOSTING_URL), reason='Missing repos_hosting_url'
)
@pytest.fixture(scope='class', autouse=True)
def class_setup(self, request, module_product, class_target_sat):
"""Set up organization, product and repositories for tests."""
Expand Down Expand Up @@ -1429,9 +1426,6 @@ def test_negative_non_readonly_user_actions(target_sat, content_view, function_r
class TestOstreeContentView:
"""Tests for ostree contents in content views."""

@pytest.mark.skipif(
(not settings.robottelo.REPOS_HOSTING_URL), reason='Missing repos_hosting_url'
)
@pytest.fixture(scope='class', autouse=True)
def initiate_testclass(self, request, module_product, class_target_sat):
"""Set up organization, product and repositories for tests."""
Expand Down Expand Up @@ -1536,7 +1530,6 @@ def test_positive_publish_promote_with_custom_ostree_and_other(self, content_vie
class TestContentViewRedHatOstreeContent:
"""Tests for publishing and promoting cv with RH ostree contents."""

@pytest.mark.run_in_one_thread
@pytest.fixture(scope='class', autouse=True)
def initiate_testclass(self, request, module_entitlement_manifest_org, class_target_sat):
"""Set up organization, product and repositories for tests."""
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_computeresource_libvirt.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ def invalid_update_data():


@pytest.fixture(scope="module")
@pytest.mark.skip_if_not_set('libvirt')
def libvirt_url():
return LIBVIRT_RESOURCE_URL % settings.libvirt.libvirt_hostname

Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,6 @@ def test_positive_install_package_via_rex(


# -------------------------- HOST SUBSCRIPTION SUBCOMMAND FIXTURES --------------------------
@pytest.mark.skip_if_not_set('clients')
@pytest.fixture
def host_subscription_client(rhel7_contenthost, target_sat):
rhel7_contenthost.install_katello_ca(target_sat)
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/destructive/test_ldap_authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def rhsso_groups_teardown(module_target_sat, default_sso_host):
default_sso_host.delete_rhsso_group(group_name)


@pytest.mark.external_auth
@pytest.fixture
def configure_hammer_session(parametrized_enrolled_sat, enable=True):
"""Take backup of the hammer config file and enable use_sessions"""
Expand Down
Loading