Update checkpanelmemory to include the inhibitor flag and adjust tests

Author: prilr

repos/system_upgrade/cloudlinux/actors/checkpanelmemory/libraries/checkpanelmemory.py

@@ -55,6 +55,6 @@ def process():
                 reporting.Title(title),
                 reporting.Summary(summary),
                 reporting.Severity(reporting.Severity.HIGH),
-                reporting.Groups([reporting.Groups.SANITY]),
+                reporting.Groups([reporting.Groups.SANITY, reporting.Groups.INHIBITOR]),
             ]
         )

repos/system_upgrade/cloudlinux/actors/checkpanelmemory/tests/test_checkpanelmemory.py

@@ -1,8 +1,9 @@
 from leapp import reporting
-from leapp.libraries.actor import checkmemory
+from leapp.libraries.actor import checkpanelmemory
 from leapp.libraries.common.testutils import create_report_mocked, CurrentActorMocked
 from leapp.libraries.stdlib import api
 from leapp.models import MemoryInfo, InstalledControlPanel
+from leapp.utils.report import is_inhibitor
 
 from leapp.libraries.common.detectcontrolpanel import (
     UNKNOWN_NAME,
@@ -12,31 +13,47 @@
 
 
 def test_check_memory_low(monkeypatch):
-    minimum_req_error = []
     monkeypatch.setattr(api, "current_actor", CurrentActorMocked())
-    minimum_req_error = checkmemory._check_memory(
-        InstalledControlPanel(name=INTEGRATED_NAME), MemoryInfo(mem_total=1024)
+    # _check_memory(panel_name, mem_info): panel must be string key for required_memory
+    minimum_req_error = checkpanelmemory._check_memory(
+        INTEGRATED_NAME, MemoryInfo(mem_total=1024)
     )
     assert minimum_req_error
 
 
 def test_check_memory_high(monkeypatch):
-    minimum_req_error = []
     monkeypatch.setattr(api, "current_actor", CurrentActorMocked())
-    minimum_req_error = checkmemory._check_memory(
-        InstalledControlPanel(name=CPANEL_NAME), MemoryInfo(mem_total=16273492)
+    minimum_req_error = checkpanelmemory._check_memory(
+        CPANEL_NAME, MemoryInfo(mem_total=16273492)
     )
     assert not minimum_req_error
 
 
+def _mock_consume(panel_name, memory_info):
+    """Return a consume that yields the right model type for process()."""
+
+    def consume(model):
+        if model is InstalledControlPanel:
+            return iter([InstalledControlPanel(name=panel_name)])
+        if model is MemoryInfo:
+            return iter([memory_info])
+        return iter([])
+
+    return consume
+
+
 def test_report(monkeypatch):
     title_msg = "Minimum memory requirements for panel {} are not met".format(
         UNKNOWN_NAME
     )
     monkeypatch.setattr(api, "current_actor", CurrentActorMocked())
-    monkeypatch.setattr(api, "consume", lambda x: iter([MemoryInfo(mem_total=129)]))
+    monkeypatch.setattr(
+        api,
+        "consume",
+        _mock_consume(UNKNOWN_NAME, MemoryInfo(mem_total=129)),
+    )
     monkeypatch.setattr(reporting, "create_report", create_report_mocked())
-    checkmemory.process()
+    checkpanelmemory.process()
     assert reporting.create_report.called
     assert title_msg == reporting.create_report.report_fields["title"]
-    assert reporting.Flags.INHIBITOR in reporting.create_report.report_fields["flags"]
+    assert is_inhibitor(reporting.create_report.report_fields)