1 files changed, 58 insertions, 29 deletions
diff --git a/roles/openshift_health_checker/test/aos_version_test.py b/roles/openshift_health_checker/test/aos_version_test.py
index 39c86067a..697805dd2 100644
--- a/roles/openshift_health_checker/test/aos_version_test.py
+++ b/roles/openshift_health_checker/test/aos_version_test.py
@@ -4,89 +4,118 @@ import aos_version
 from collections import namedtuple
 Package = namedtuple('Package', ['name', 'version'])
 
-expected_pkgs = set(['spam', 'eggs'])
+expected_pkgs = {
+    "spam": {
+        "name": "spam",
+        "version": "3.2.1",
+        "check_multi": False,
+    },
+    "eggs": {
+        "name": "eggs",
+        "version": "3.2.1",
+        "check_multi": False,
+    },
+}
 
 
-@pytest.mark.parametrize('pkgs, requested_release, expect_not_found', [
+@pytest.mark.parametrize('pkgs, expect_not_found', [
     (
         [],
-        '3.2.1',
-        expected_pkgs,  # none found
+        {
+            "spam": {
+                "name": "spam",
+                "version": "3.2.1",
+                "check_multi": False,
+            },
+            "eggs": {
+                "name": "eggs",
+                "version": "3.2.1",
+                "check_multi": False,
+            }
+        },  # none found
     ),
     (
         [Package('spam', '3.2.1')],
-        '3.2',
-        ['eggs'],  # completely missing
+        {
+            "eggs": {
+                "name": "eggs",
+                "version": "3.2.1",
+                "check_multi": False,
+            }
+        },  # completely missing
     ),
     (
         [Package('spam', '3.2.1'), Package('eggs', '3.3.2')],
-        '3.2',
-        ['eggs'],  # not the right version
+        {
+            "eggs": {
+                "name": "eggs",
+                "version": "3.2.1",
+                "check_multi": False,
+            }
+        },  # not the right version
     ),
     (
         [Package('spam', '3.2.1'), Package('eggs', '3.2.1')],
-        '3.2',
-        [],  # all found
+        {},  # all found
     ),
     (
         [Package('spam', '3.2.1'), Package('eggs', '3.2.1.5')],
-        '3.2.1',
-        [],  # found with more specific version
+        {},  # found with more specific version
     ),
     (
         [Package('eggs', '1.2.3'), Package('eggs', '3.2.1.5')],
-        '3.2.1',
-        ['spam'],  # eggs found with multiple versions
+        {
+            "spam": {
+                "name": "spam",
+                "version": "3.2.1",
+                "check_multi": False,
+            }
+        },  # eggs found with multiple versions
     ),
 ])
-def test_check_pkgs_for_precise_version(pkgs, requested_release, expect_not_found):
+def test_check_pkgs_for_precise_version(pkgs, expect_not_found):
     if expect_not_found:
         with pytest.raises(aos_version.PreciseVersionNotFound) as e:
-            aos_version._check_precise_version_found(pkgs, expected_pkgs, requested_release)
-        assert set(expect_not_found) == set(e.value.problem_pkgs)
+            aos_version._check_precise_version_found(pkgs, expected_pkgs)
+
+        assert list(expect_not_found.values()) == e.value.problem_pkgs
     else:
-        aos_version._check_precise_version_found(pkgs, expected_pkgs, requested_release)
+        aos_version._check_precise_version_found(pkgs, expected_pkgs)
 
 
-@pytest.mark.parametrize('pkgs, requested_release, expect_higher', [
+@pytest.mark.parametrize('pkgs, expect_higher', [
     (
         [],
-        '3.2.1',
         [],
     ),
     (
-        [Package('spam', '3.2.1')],
-        '3.2',
+        [Package('spam', '3.2.1.9')],
         [],  # more precise but not strictly higher
     ),
     (
         [Package('spam', '3.3')],
-        '3.2.1',
         ['spam-3.3'],  # lower precision, but higher
     ),
     (
         [Package('spam', '3.2.1'), Package('eggs', '3.3.2')],
-        '3.2',
         ['eggs-3.3.2'],  # one too high
     ),
     (
         [Package('eggs', '1.2.3'), Package('eggs', '3.2.1.5'), Package('eggs', '3.4')],
-        '3.2.1',
         ['eggs-3.4'],  # multiple versions, one is higher
     ),
     (
         [Package('eggs', '3.2.1'), Package('eggs', '3.4'), Package('eggs', '3.3')],
-        '3.2.1',
         ['eggs-3.4'],  # multiple versions, two are higher
     ),
 ])
-def test_check_pkgs_for_greater_version(pkgs, requested_release, expect_higher):
+def test_check_pkgs_for_greater_version(pkgs, expect_higher):
     if expect_higher:
         with pytest.raises(aos_version.FoundHigherVersion) as e:
-            aos_version._check_higher_version_found(pkgs, expected_pkgs, requested_release)
+            aos_version._check_higher_version_found(pkgs, expected_pkgs)
         assert set(expect_higher) == set(e.value.problem_pkgs)
     else:
-        aos_version._check_higher_version_found(pkgs, expected_pkgs, requested_release)
+        aos_version._check_higher_version_found(pkgs, expected_pkgs)
 
 
 @pytest.mark.parametrize('pkgs, expect_to_flag_pkgs', [