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

[RHELC-1503] Fix RHSM facts filepath in a log message #1183

Merged
merged 2 commits into from
Apr 23, 2024
Merged

[RHELC-1503] Fix RHSM facts filepath in a log message #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c3071
Fix RHSM facts filepath in a log message
bocekm Apr 17, 2024
e6e6e35
Fix integration test
r0x0d Apr 23, 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
8 changes: 4 additions & 4 deletions convert2rhel/breadcrumbs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ def _save_rhsm_facts(self):
def print_data_collection(self):
"""Print information about data collection and ask for acknowledgement."""
loggerinst.info(
"The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.fact file that contains the below data"
" about the system conversion. The subscription-manager then uploads the data to the server the system is"
" registered to.\n"
"The convert2rhel utility generates a %s file that contains the below data about the system conversion."
" The subscription-manager then uploads the data to the server the system is registered to.\n"
"- The Convert2RHEL command as executed\n"
"- The Convert2RHEL RPM version and GPG signature\n"
"- Success or failure status of the conversion\n"
"- Conversion start and end timestamps\n"
"- Source OS vendor and version\n"
"- Target RHEL version\n"
"- Convert2RHEL related environment variables\n\n"
"- Convert2RHEL related environment variables\n\n",
RHSM_CUSTOM_FACTS_FILE,
)

utils.ask_to_continue()
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def test_data_collection_acknowledgement(shell, convert2rhel):
assert c2r.expect("Prepare: Inform about data collection", timeout=300) == 0
assert (
c2r.expect(
"The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.fact file that contains the below data about the system conversion.",
"The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.facts file that contains the below data about the system conversion.",
timeout=300,
)
== 0
Expand Down
2 changes: 1 addition & 1 deletion ...n-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def test_validation_packages_with_in_name_period(shell, convert2rhel, packages_w
assert c2r.expect("Prepare: Inform about data collection", timeout=300) == 0
assert (
c2r.expect(
"The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.fact file that contains the below data about the system conversion.",
"The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.facts file that contains the below data about the system conversion.",
timeout=300,
)
== 0
Expand Down