Merge pull request #48 from prilr/mysql-setup

Minor actor fixes and test adjustments

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)

repos/system_upgrade/cloudlinux/actors/clmysqlrepositorysetup/libraries/clmysql_upstream_mariadb.py

@@ -32,6 +32,7 @@ def _make_upgrade_mariadb_url(mariadb_url, source_major, target_major):
     We replace the parts of the URL to make them work with the target OS version.
     """
     if not mariadb_url:
+        api.current_logger().warning("Unsupported repository URL={}, skipping".format(mariadb_url))
         return None
     # Replace the first occurrence of source_major with target_major after 'yum'
     url_parts = mariadb_url.split("yum", 1)
@@ -43,10 +44,15 @@ def _make_upgrade_mariadb_url(mariadb_url, source_major, target_major):
         # Replace $releasever because upstream repos expect major version
         # and cloudlinux provides major.minor as $releasever
         url_parts[1] = url_parts[1].replace('$releasever', str(target_major))
-        return "yum".join(url_parts)
+        new_url = "yum".join(url_parts)
+        # Treat as unsupported if no version replacement was made (e.g. "example.com/mariadb/yum")
+        if new_url == mariadb_url and "/{}/".format(target_major) not in new_url:
+            api.current_logger().warning("Unsupported repository URL={}, skipping".format(mariadb_url))
+            return None
+        return new_url
     else:
         api.current_logger().warning("Unsupported repository URL={}, skipping".format(mariadb_url))
-        return
+        return None
 
 
 def mariadb_process(lib, repofile_name, repofile_data):

repos/system_upgrade/cloudlinux/actors/scanrolloutrepositories/tests/test_releasever_replace.py

@@ -1,4 +1,4 @@
-from leapp.libraries.actor import scanrolloutrepositories
+from leapp.libraries.actor import scanrolloutrepositories
 from leapp.libraries.common import cl_repofileutils
 from leapp.libraries.common.testutils import produce_mocked
 from leapp.libraries.stdlib import api
@@ -34,14 +34,17 @@ def __call__(self):
 
 
 def test_valid_repofile_exists(monkeypatch):
-    def create_leapp_repofile_copy_mocked():
+    def create_leapp_repofile_copy_mocked(*args, **kwargs):
         return "/leapp_copy_path/newrepo.repo"
 
     monkeypatch.setattr(api, 'produce', produce_mocked())
-    monkeypatch.setattr(cl_repofileutils, 'create_leapp_repofile_copy', create_leapp_repofile_copy_mocked)
+    monkeypatch.setattr(
+        scanrolloutrepositories, 'create_leapp_repofile_copy',
+        create_leapp_repofile_copy_mocked,
+    )
     monkeypatch.setattr(api, 'current_logger', LoggerMocked())
 
-    scanrolloutrepositories.process_repodata(_REPOFILE)
+    scanrolloutrepositories.process_repodata(_REPOFILE, _REPOFILE.file)
 
     assert api.produce.called == len(_REPODATA) + 1