Fix tests for Fedora > 30, rpmconf changed output

rpm-software-management · Oct 16, 2019 · e881bf7 · e881bf7
1 parent 381af7b
commit e881bf7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/test_rpmconf.py b/tests/test_rpmconf.py
@@ -182,8 +182,12 @@ def merge_conf_files(_, conf_file, other_file):
 
             lines = stdout.getvalue().splitlines()
 
-        expected_last_line = "File {0} was removed by 3rd party. Skipping.".format(new_path)
-        self.assertEqual(lines[-1], expected_last_line)
+        expected_last_line_to_f30 = "File {0} was removed by 3rd party. Skipping.".format(new_path)
+        # Newer rpmconf changed output since F31
+        expected_last_line_from_f31 = "File {0} has been merged.".format(new_path)
+
+        self.assertRegexpMatches(lines[-1], "{0}|{1}"
+                                 .format(expected_last_line_to_f30, expected_last_line_from_f31))
 
     def test_diff_output(self):
         self._create_conf()