Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Adam Hosek <hosek.adam@outlook.com>
  • Loading branch information
r0x0d and hosekadam committed Feb 15, 2024
1 parent c989332 commit 4f4f2e1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions convert2rhel/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def main_locked():
except _AnalyzeExit:
breadcrumbs.breadcrumbs.finish_collection(success=True)
# Update RHSM custom facts only when this returns False. Otherwise,
# sub-man get uninstalled and the data is removed from the server.
# sub-man get uninstalled and the data is removed from the RHSM server.
if not subscription.should_subscribe():
subscription.update_rhsm_custom_facts()

Expand Down Expand Up @@ -207,7 +207,7 @@ def _handle_main_exceptions(process_phase, pre_conversion_results=None):
loggerinst.info(no_changes_msg)
elif process_phase == ConversionPhase.PRE_PONR_CHANGES:
# Update RHSM custom facts only when this returns False. Otherwise,
# sub-man get uninstalled and the data is removed from the server.
# sub-man get uninstalled and the data is removed from the RHSM server.
if not subscription.should_subscribe():
subscription.update_rhsm_custom_facts()

Expand Down
9 changes: 2 additions & 7 deletions tests/integration/tier0/non-destructive/rhsm-facts/main.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@ description+: |
summary+: |
RHSM facts update after analysis
description+: |
TODO(r0x0d): ...

This test verifies, that the TASK - [Convert: List third-party packages]
won't fail listing packages if previously problematic third party packages are installed.
Installed package(s):
v8-devel from the epel repository
nodejs from the epel repository
This test verifies that the RHSM facts are uploaded when running
convert2rhel with analysis option.
tag+:
- test-rhsm-facts-called-in-analysis
test: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@pytest.mark.test_rhsm_facts_called_in_analysis
def test_rhsm_facts_called_after_analysis(convert2rhel, pre_registered):
"""
...
Verify that the RHSM custom facts are uploaded after the analysis is done.
"""
with convert2rhel("analyze -y --debug") as c2r:
# Verify that the analysis report is printed
Expand Down

0 comments on commit 4f4f2e1

Please sign in to comment.