Skip to content

Commit

Permalink
Remove unused code related to is_open bz (#16347)
Browse files Browse the repository at this point in the history
* Remove unused code related to is_open bz

* Remove skip_if_open marker from tests

(cherry picked from commit cc2518d)
  • Loading branch information
jameerpathan111 authored and web-flow committed Sep 16, 2024
1 parent 9f09ef3 commit 69f2c8c
Show file tree
Hide file tree
Showing 36 changed files with 8 additions and 118 deletions.
2 changes: 0 additions & 2 deletions tests/foreman/api/test_capsulecontent.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ def test_positive_checksum_sync(
assert new_checksum in checksum_types
assert original_checksum not in checksum_types

@pytest.mark.skip_if_open("BZ:2025494")
@pytest.mark.e2e
@pytest.mark.tier4
@pytest.mark.pit_client
Expand Down Expand Up @@ -761,7 +760,6 @@ def test_positive_update_with_immediate_sync(
caps_files = get_repo_files_by_url(caps_repo_url)
assert len(caps_files) == packages_count

@pytest.mark.skip_if_open("BZ:2122780")
@pytest.mark.tier4
@pytest.mark.skip_if_not_set('capsule', 'fake_manifest')
def test_positive_capsule_pub_url_accessible(self, module_capsule_configured):
Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/api/test_contentview.py
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,6 @@ def test_negative_non_readonly_user_actions(target_sat, content_view, function_r
target_sat.api.ContentView(id=content_view.id).read()


@pytest.mark.skip_if_open("BZ:1625783")
class TestOstreeContentView:
"""Tests for ostree contents in content views."""

Expand Down Expand Up @@ -1315,7 +1314,6 @@ def test_positive_publish_promote_with_custom_ostree_and_other(self, content_vie
assert len(content_view.read().version[0].read().environment) == 2


@pytest.mark.skip_if_open("BZ:1625783")
class TestContentViewRedHatOstreeContent:
"""Tests for publishing and promoting cv with RH ostree contents."""

Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/api/test_operatingsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ def test_negative_create_with_too_long_description(self, target_sat):
with pytest.raises(HTTPError):
target_sat.api.OperatingSystem(description=gen_string('alphanumeric', 256)).create()

@pytest.mark.skip_if_open('BZ:2101435')
@pytest.mark.tier1
@pytest.mark.parametrize('major_version', **parametrized((gen_string('numeric', 6), '', '-6')))
def test_negative_create_with_invalid_major_version(self, major_version, target_sat):
Expand Down Expand Up @@ -375,7 +374,6 @@ def test_negative_update_name(self, new_name, target_sat):
with pytest.raises(HTTPError):
os = target_sat.api.OperatingSystem(id=os.id, name=new_name).update(['name'])

@pytest.mark.skip_if_open('BZ:2101435')
@pytest.mark.tier1
def test_negative_update_major_version(self, target_sat):
"""Create operating entity providing the initial major version,
Expand Down
5 changes: 1 addition & 4 deletions tests/foreman/api/test_remoteexecution.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from robottelo.config import settings
from robottelo.hosts import get_sat_version
from robottelo.utils import ohsnap
from robottelo.utils.issue_handlers import is_open

CAPSULE_TARGET_VERSION = f'6.{get_sat_version().minor}.z'

Expand All @@ -38,9 +37,7 @@ def test_positive_run_capsule_upgrade_playbook(module_capsule_configured, target
:CaseImportance: Medium
"""
template_name = (
'Smart Proxy Upgrade Playbook' if is_open('BZ:2152951') else 'Capsule Upgrade Playbook'
)
template_name = 'Capsule Upgrade Playbook'
template_id = (
target_sat.api.JobTemplate().search(query={'search': f'name="{template_name}"'})[0].id
)
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/api/test_repositories.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
from robottelo.utils.datafactory import parametrized


@pytest.mark.skip_if_open('BZ:2137950')
@pytest.mark.tier1
def test_negative_disable_repository_with_cv(module_sca_manifest_org, target_sat):
"""Attempt to disable a Repository that is published in a Content View
Expand Down
4 changes: 0 additions & 4 deletions tests/foreman/api/test_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ def test_positive_create_with_default_download_policy(self, repo, target_sat):
assert default_dl_policy
assert repo.download_policy == default_dl_policy[0].value

@pytest.mark.skip_if_open("BZ:2042473")
@pytest.mark.tier1
@pytest.mark.parametrize(
'repo_options', **datafactory.parametrized([{'content_type': 'yum'}]), indirect=True
Expand Down Expand Up @@ -781,7 +780,6 @@ def test_negative_update_name(self, repo, name):
with pytest.raises(HTTPError):
repo.update(['name'])

@pytest.mark.skip_if_open('BZ:1311113')
@pytest.mark.tier1
def test_negative_update_label(self, repo):
"""Attempt to update repository label to another one.
Expand Down Expand Up @@ -871,7 +869,6 @@ def test_positive_synchronize_auth_yum_repo(self, repo):
# Verify it has finished
assert repo.read().content_counts['rpm'] >= 1

@pytest.mark.skip_if_open("BZ:2035025")
@pytest.mark.tier2
@pytest.mark.skipif(
(not settings.robottelo.REPOS_HOSTING_URL), reason='Missing repos_hosting_url'
Expand Down Expand Up @@ -2141,7 +2138,6 @@ def test_negative_synchronize_docker_repo_with_invalid_tags(self, repo_options,
class TestSRPMRepository:
"""Tests specific to using repositories containing source RPMs."""

@pytest.mark.skip_if_open("BZ:2016047")
@pytest.mark.upgrade
@pytest.mark.tier2
def test_positive_srpm_upload_publish_promote_cv(
Expand Down
8 changes: 0 additions & 8 deletions tests/foreman/api/test_rhc.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
from fauxfactory import gen_string
import pytest

from robottelo.utils.issue_handlers import is_open


@pytest.fixture
def fixture_enable_rhc_repos(target_sat):
Expand Down Expand Up @@ -49,12 +47,6 @@ def test_positive_configure_cloud_connector(target_sat, default_org, fixture_ena
:CaseImportance: Critical
"""

# Delete old satellite hostname if BZ#2130173 is open
if is_open('BZ:2130173'):
host = target_sat.api.Host().search(query={'search': f"! {target_sat.hostname}"})[0]
host.delete()

# Copy foreman-proxy user's key to root@localhost user's authorized_keys
target_sat.add_rex_key(satellite=target_sat)

Expand Down
8 changes: 3 additions & 5 deletions tests/foreman/api/test_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -1422,10 +1422,9 @@ def test_positive_create_user_by_org_admin(self, role_taxonomies, target_sat):
).create()
assert user_login == user.login
assert org_admin.id == user.role[0].id
if not is_open('BZ:1825698'):
name = gen_string('alphanumeric')
location = target_sat.api.Location(sc_user, name=name).create()
assert location.name == name
name = gen_string('alphanumeric')
location = target_sat.api.Location(sc_user, name=name).create()
assert location.name == name

@pytest.mark.tier2
def test_positive_access_users_inside_org_admin_taxonomies(self, role_taxonomies, target_sat):
Expand Down Expand Up @@ -1457,7 +1456,6 @@ def test_positive_access_users_inside_org_admin_taxonomies(self, role_taxonomies
except HTTPError as err:
pytest.fail(str(err))

@pytest.mark.skip_if_open('BZ:1825698')
@pytest.mark.tier2
def test_positive_create_nested_location(self, role_taxonomies, target_sat):
"""Org Admin can create nested locations
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/api/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def test_positive_update_login_page_footer_text_with_long_string(setting_update)
assert setting_update.value == login_text_value


@pytest.mark.skip_if_open("BZ:1470083")
@pytest.mark.tier2
@pytest.mark.parametrize('setting_update', ['discovery_hostname'], indirect=True)
def test_negative_update_hostname_with_empty_fact(setting_update):
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/api/test_templatesync.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,6 @@ def test_positive_import_json_output_corrupted_metadata(
template['message']['templates'][0]['additional_errors'] == 'Failed to parse metadata'
)

@pytest.mark.skip_if_open('BZ:1787355')
@pytest.mark.tier2
def test_positive_import_json_output_filtered_skip_message(
self, create_import_export_local_dir, module_org, module_target_sat
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_computeresource_rhev.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ def test_positive_add_image_rhev_with_name(rhev, module_os, module_target_sat):
assert result[0]['uuid'] == rhev.image_uuid


@pytest.mark.skip_if_open("BZ:1829239")
@pytest.mark.tier2
def test_negative_add_image_rhev_with_invalid_uuid(rhev, module_os, module_target_sat):
"""Attempt to add invalid image to the RHEV compute resource
Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/cli/test_contentview.py
Original file line number Diff line number Diff line change
Expand Up @@ -3429,7 +3429,6 @@ def make_file_repository_upload_contents(
assert int(new_repo['content-counts']['files']) > 0
return new_repo

@pytest.mark.skip_if_open('BZ:1610309')
@pytest.mark.tier3
def test_positive_arbitrary_file_repo_addition(
self, module_org, module_product, module_target_sat
Expand Down Expand Up @@ -3471,7 +3470,6 @@ def test_positive_arbitrary_file_repo_addition(
cv = module_target_sat.cli.ContentView.info({'id': cv['id']})
assert cv['file-repositories'][0]['name'] == repo['name']

@pytest.mark.skip_if_open('BZ:1908465')
@pytest.mark.tier3
def test_positive_arbitrary_file_repo_removal(
self, module_org, module_product, module_target_sat
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_fact.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
pytestmark = [pytest.mark.tier1]


@pytest.mark.skip_if_open('BZ:2161294')
@pytest.mark.upgrade
@pytest.mark.parametrize(
'fact', ['uptime', 'os::family', 'uptime_seconds', 'memorysize', 'ipaddress']
Expand Down
7 changes: 3 additions & 4 deletions tests/foreman/cli/test_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
valid_data_list,
valid_hosts_list,
)
from robottelo.utils.issue_handlers import is_open


@pytest.fixture(scope="module")
Expand Down Expand Up @@ -706,14 +705,14 @@ def test_positive_list_infrastructure_hosts(
target_sat.cli.Host.update({'name': target_sat.hostname, 'new-organization-id': module_org.id})
# list satellite hosts
hosts = target_sat.cli.Host.list({'search': 'infrastructure_facet.foreman=true'})
assert len(hosts) == 2 if is_open('BZ:1994685') else len(hosts) == 1
assert len(hosts) == 2
hostnames = [host['name'] for host in hosts]
assert rhel7_contenthost.hostname not in hostnames
assert target_sat.hostname in hostnames
# list capsule hosts
hosts = target_sat.cli.Host.list({'search': 'infrastructure_facet.smart_proxy_id=1'})
hostnames = [host['name'] for host in hosts]
assert len(hosts) == 2 if is_open('BZ:1994685') else len(hosts) == 1
assert len(hosts) == 2
assert rhel7_contenthost.hostname not in hostnames
assert target_sat.hostname in hostnames

Expand Down Expand Up @@ -859,7 +858,7 @@ def test_positive_list_with_nested_hostgroup(target_sat):
logger.info(f'Host info: {host}')
assert host['operating-system']['medium'] == options.medium.name
assert host['operating-system']['partition-table'] == options.ptable.name # inherited
if not is_open('BZ:2215294') or not target_sat.is_stream:
if not target_sat.is_stream:
assert 'id' in host['content-information']['lifecycle-environment']
assert int(host['content-information']['lifecycle-environment']['id']) == int(lce.id)
assert int(host['content-information']['content-view']['id']) == int(
Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/cli/test_organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,6 @@ def test_positive_add_and_remove_media(module_org, module_target_sat):


@pytest.mark.tier2
@pytest.mark.skip_if_open("BZ:1845860")
@pytest.mark.skip_if_open("BZ:1886876")
def test_positive_add_and_remove_templates(module_org, module_target_sat):
"""Add and remove provisioning templates to organization
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_oscap_tailoringfiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ def test_negative_associate_tailoring_file_with_different_scap(self):
:CaseImportance: Medium
"""

@pytest.mark.skip_if_open("BZ:1857572")
@pytest.mark.tier2
def test_positive_download_tailoring_file(self, tailoring_file_path, target_sat):
"""Download the tailoring file from satellite
Expand Down
5 changes: 0 additions & 5 deletions tests/foreman/cli/test_ostreebranch.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def ostree_repo_with_user(ostree_user_credentials, module_target_sat):
return {'cv': cv, 'org': org, 'ostree_repo': ostree_repo, 'product': product}


@pytest.mark.skip_if_open("BZ:1625783")
def test_positive_list(ostree_user_credentials, ostree_repo_with_user, module_target_sat):
"""List Ostree Branches
Expand Down Expand Up @@ -96,7 +95,6 @@ def test_positive_list_by_repo_id(
assert len(result) > 0


@pytest.mark.skip_if_open("BZ:1625783")
def test_positive_list_by_product_id(
ostree_repo_with_user, ostree_user_credentials, module_target_sat
):
Expand All @@ -112,7 +110,6 @@ def test_positive_list_by_product_id(
assert len(result) > 0


@pytest.mark.skip_if_open("BZ:1625783")
def test_positive_list_by_org_id(ostree_repo_with_user, ostree_user_credentials, module_target_sat):
"""List Ostree branches by org id
Expand All @@ -126,7 +123,6 @@ def test_positive_list_by_org_id(ostree_repo_with_user, ostree_user_credentials,
assert len(result) > 0


@pytest.mark.skip_if_open("BZ:1625783")
def test_positive_list_by_cv_id(ostree_repo_with_user, ostree_user_credentials, module_target_sat):
"""List Ostree branches by cv id
Expand All @@ -140,7 +136,6 @@ def test_positive_list_by_cv_id(ostree_repo_with_user, ostree_user_credentials,
assert len(result) > 0


@pytest.mark.skip_if_open("BZ:1625783")
def test_positive_info_by_id(ostree_user_credentials, ostree_repo_with_user, module_target_sat):
"""Get info for Ostree branch by id
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/cli/test_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ def test_product_list_with_default_settings(module_org, target_sat):


@pytest.mark.tier2
@pytest.mark.skip_if_open('BZ:1999541')
def test_positive_product_sync_state(module_org, module_target_sat):
"""hammer product info shows correct sync state.
Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/cli/test_reporttemplates.py
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,6 @@ def test_negative_nonauthor_of_report_cant_download_it(module_target_sat):


@pytest.mark.tier2
@pytest.mark.skip_if_open('BZ:1750924')
def test_positive_generate_with_name_and_org(module_target_sat):
"""Generate Host Status report, specifying template name and organization
Expand Down Expand Up @@ -675,7 +674,6 @@ def test_positive_generate_with_name_and_org(module_target_sat):


@pytest.mark.tier2
@pytest.mark.skip_if_open('BZ:1782807')
def test_positive_generate_ansible_template(module_target_sat):
"""Report template named 'Ansible Inventory' (default name is specified in settings)
must be present in Satellite 6.7 and later in order to provide enhanced functionality
Expand Down
3 changes: 0 additions & 3 deletions tests/foreman/cli/test_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@ def test_positive_synchronize_file_repo(self, repo_options, repo, target_sat):
assert repo['sync']['status'] == 'Success'
assert int(repo['content-counts']['files']) == CUSTOM_FILE_REPO_FILES_COUNT

@pytest.mark.skip_if_open("BZ:2035025")
@pytest.mark.tier2
@pytest.mark.parametrize(
'repo_options',
Expand Down Expand Up @@ -1460,7 +1459,6 @@ def test_positive_upload_content_to_file_repo(self, repo, target_sat):
new_repo = target_sat.cli.Repository.info({'id': new_repo['id']})
assert int(new_repo['content-counts']['files']) == CUSTOM_FILE_REPO_FILES_COUNT + 1

@pytest.mark.skip_if_open("BZ:1410916")
@pytest.mark.tier2
@pytest.mark.parametrize(
'repo_options',
Expand Down Expand Up @@ -1861,7 +1859,6 @@ def test_module_stream_info_validation(self, repo, module_target_sat):
}

@pytest.mark.tier1
@pytest.mark.skip_if_open('BZ:2002653')
def test_negative_update_red_hat_repo(self, module_manifest_org, module_target_sat):
"""Updates to Red Hat products fail.
Expand Down
5 changes: 1 addition & 4 deletions tests/foreman/destructive/test_remoteexecution.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

from robottelo.config import get_credentials
from robottelo.hosts import get_sat_version
from robottelo.utils.issue_handlers import is_open

CAPSULE_TARGET_VERSION = f'6.{get_sat_version().minor}.z'

Expand All @@ -42,9 +41,7 @@ def test_negative_run_capsule_upgrade_playbook_on_satellite(target_sat):
:CaseImportance: Medium
"""
template_name = (
'Smart Proxy Upgrade Playbook' if is_open('BZ:2152951') else 'Capsule Upgrade Playbook'
)
template_name = 'Capsule Upgrade Playbook'
template_id = (
target_sat.api.JobTemplate().search(query={'search': f'name="{template_name}"'})[0].id
)
Expand Down
5 changes: 0 additions & 5 deletions tests/foreman/endtoend/test_api_endtoend.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
user_nailgun_config,
)
from robottelo.constants.repos import CUSTOM_RPM_REPO
from robottelo.utils.issue_handlers import is_open

API_PATHS = {
'activation_keys': (
Expand Down Expand Up @@ -908,10 +907,6 @@
def filtered_api_paths():
"""Filter the API_PATHS dict based on BZs that impact various endpoints"""
missing = defaultdict(list)
if is_open('BZ:1887932'):
missing['subscriptions'].append(
'/katello/api/activation_keys/:activation_key_id/subscriptions'
)
filtered_paths = API_PATHS.copy()
for endpoint, missing_paths in missing.items():
filtered_paths[endpoint] = tuple(
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/ui/test_branding.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@


@pytest.mark.e2e
@pytest.mark.skip_if_open("BZ:2105949")
def test_verify_satellite_login_screen_info(target_sat):
"""Verify Satellite version on the login screen
Expand Down
1 change: 0 additions & 1 deletion tests/foreman/ui/test_computeresource_ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def module_ec2_settings():
@pytest.mark.e2e
@pytest.mark.tier2
@pytest.mark.skip_if_not_set('http_proxy')
@pytest.mark.skip_if_open("BZ:2032530")
def test_positive_default_end_to_end_with_custom_profile(
session, module_org, module_location, module_ec2_settings, module_target_sat
):
Expand Down
Loading

0 comments on commit 69f2c8c

Please sign in to comment.