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.

Sign up for GitHub

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

Remove the MultiCV hack since it's become available #16893

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Remove the MultiCV hack since it's become available #16893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b80a5d7
Remove the MultiCV hack since it's become available
vsedmik Nov 11, 2024
a91f6a4
Remove assertion for multi-cv settings exposion
vsedmik Nov 21, 2024
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/contentview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def module_cv_repo(module_org, module_repository, module_lce, module_target_sat)
@pytest.fixture(scope='session')
def session_multicv_sat(session_satellite_host):
"""Satellite with multi-CV enabled"""
session_satellite_host.enable_multicv_setting()
session_satellite_host.update_setting('allow_multiple_content_views', 'True')
return session_satellite_host

Expand Down
17 changes: 0 additions & 17 deletions robottelo/host_helpers/satellite_mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,6 @@ def enable_puppet_satellite(self):
assert 'Success!' in result.stdout
return self

def enable_multicv_setting(self):
"""Makes multi-CV setting available in the downstream Satellite"""
if len(
self.api.Setting().search(query={'search': 'name={"allow_multiple_content_views"}'})
):
return # Setting is already exposed
cfg_file = 'upstream_only_settings.rb'
cfg_path = self.execute(f'find /usr/share/gems/gems/ -name {cfg_file}').stdout.strip()
assert cfg_file in cfg_path, 'Config file not found'
self.execute(
f'sed -i "s/allow_multiple_content_views/#allow_multiple_content_views/g" {cfg_path}'
)
self.cli.Service.restart()
assert len(
self.api.Setting().search(query={'search': f'name={"allow_multiple_content_views"}'})
), 'Multi-CV enablement failed'


class ContentInfo:
"""Miscellaneous content helper methods"""
Expand Down