Address changes in the tests

Signed-off-by: Daniel Diblik <[email protected]>
oamg · Oct 17, 2024 · 5ad2b9a · 5ad2b9a
1 parent b741564
commit 5ad2b9a
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/tests/integration/tier0/non-destructive/assessment-report/test_assessment_report.py b/tests/integration/tier0/non-destructive/assessment-report/test_assessment_report.py
@@ -83,7 +83,7 @@ def test_failures_and_skips_in_report(convert2rhel):
         c2r.expect("SUBSCRIBE_SYSTEM::FAILED_TO_SUBSCRIBE_SYSTEM")
         c2r.expect("Diagnosis: System registration failed with error")
 
-    assert c2r.exitstatus == 0
+    assert c2r.exitstatus == 2
 
     _validate_report()
 

diff --git a/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf b/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf
@@ -61,10 +61,6 @@ tag+:
 
 
 /convert2rhel_version:
-    adjust+:
-        result: xfail
-        when: distro == alma-9, oracle-9, rocky-9, stream-9
-        because: We're unable to validate the version of convert2rhel, as there is no build GA for EL9 yet
     summary+: |
         convert2rhel version check
     /c2r_is_latest_with_mocked_newer_version:

diff --git a/tests/integration/tier0/non-destructive/file-backup/test_file_backup.py b/tests/integration/tier0/non-destructive/file-backup/test_file_backup.py
@@ -144,4 +144,4 @@ def test_file_backup(convert2rhel, shell, file_action_fixture, request):
         # Verify the rollback starts and analysis report is printed out
         c2r.expect("Abnormal exit! Performing rollback")
         c2r.expect("Pre-conversion analysis report")
-    assert c2r.exitstatus == 0
+    assert c2r.exitstatus == 2
diff --git a/tests/integration/tier0/non-destructive/grub/test_invalid_changed_to_grub.py b/tests/integration/tier0/non-destructive/grub/test_invalid_changed_to_grub.py
@@ -56,4 +56,4 @@ def test_invalid_changes_to_grub_file(convert2rhel, grub_file_invalid):
             c2r.expect_exact("ERROR - (ERROR) GRUB_VALIDITY::INVALID_GRUB_FILE - Grub boot entry file is invalid") == 0
         )
 
-    assert c2r.exitstatus == 0
+    assert c2r.exitstatus == 2
diff --git a/tests/integration/tier0/non-destructive/rollback-handling/test_rollback_handling.py b/tests/integration/tier0/non-destructive/rollback-handling/test_rollback_handling.py
@@ -154,7 +154,6 @@ def test_polluted_yumdownloader_output_by_yum_plugin_local(shell, convert2rhel,
         with convert2rhel("analyze --debug -y") as c2r:
             c2r.expect("Rollback: Install removed packages")
             c2r.expect("Pre-conversion analysis report", timeout=600)
-        assert c2r.exitstatus == 0
 
         is_installed_post_rollback(shell, assign_packages())
 

diff --git a/tests/integration/tier0/non-destructive/system-release-backup/main.fmf b/tests/integration/tier0/non-destructive/system-release-backup/main.fmf
@@ -25,7 +25,7 @@ tag+:
             os-release restored without CONVERT2RHEL_INCOMPLETE_ROLLBACK
         description+: |
             In this scenario the variable `CONVERT2RHEL_INCOMPLETE_ROLLBACK` is not set, therefore
-            using analyze we expect convert2rhel to raise an error and return code 1.
+            using analyze we expect convert2rhel to raise an error and return code 2.
         environment+:
             CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK: 1
         tag+:

diff --git a/...1/non-destructive/httpd-package-transaction-error/test_httpd_package_transaction_error.py b/...1/non-destructive/httpd-package-transaction-error/test_httpd_package_transaction_error.py
@@ -76,4 +76,4 @@ def test_httpd_package_transaction_error(shell, convert2rhel, handle_packages):
         assert index == 0, "The analysis found an error. Probably related to the transaction check."
         assert c2r.expect_exact("VALIDATE_PACKAGE_MANAGER_TRANSACTION has succeeded") == 0
 
-    assert c2r.exitstatus == 0
+    assert c2r.exitstatus == 2