Adapt unit tests

Signed-off-by: Pascal Arlt <[email protected]>
uyuni-project · Feb 12, 2025 · 2e0ffeb · 2e0ffeb
1 parent 1215d89
commit 2e0ffeb
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerProvisioningTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerProvisioningTest.java
@@ -38,6 +38,7 @@
 import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
 import com.redhat.rhn.manager.entitlement.EntitlementManager;
 import com.redhat.rhn.manager.formula.FormulaMonitoringManager;
+import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
 import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest;
 import com.redhat.rhn.manager.system.ServerGroupManager;
 import com.redhat.rhn.manager.system.SystemManager;
@@ -60,6 +61,8 @@
 import com.suse.manager.webui.services.test.TestSaltApi;
 import com.suse.manager.webui.services.test.TestSystemQuery;
 
+import org.cobbler.CobblerConnection;
+import org.cobbler.SystemRecord;
 import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.jmock.junit5.JUnit5Mockery;
 import org.jmock.lib.concurrent.Synchroniser;
@@ -68,7 +71,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -131,10 +136,14 @@ public void testProvisionSystem() throws Exception {
                         "custom", "echo test-command");
                 k.getKickstartDefaults().getKstree().setChannel(server.getBaseChannel());
                 String profileName = k.getLabel();
+                Map<String, String> advancedOptions = Map.of(
+                        "kernel_options", "console=tty0", "post_kernel_options", "console=tty1"
+                );
                 RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
 
                 int result = 0;
-                result = handler.provisionSystem(admin, request, server.getId().intValue(), profileName);
+                result = handler.provisionSystem(admin, request, server.getId().intValue(), null, profileName,
+                        new Date(), advancedOptions);
 
                 // something was scheduled
                 assertNotEquals(0, result);
@@ -152,8 +161,14 @@ public void testProvisionSystem() throws Exception {
                 assertNotNull(actions);
                 KickstartInitiateAction kia = (KickstartInitiateAction) actions.get(0);
                 KickstartActionDetails kad = kia.getKickstartActionDetails();
+                assertEquals(" console=tty0", kad.getAppendString());
                 assertEquals(ConfigDefaults.get().getHostname(), kad.getKickstartHost());
 
+                // Cobbler kernel and post kernel options
+                CobblerConnection con = CobblerXMLRPCHelper.getConnection(admin);
+                SystemRecord rec =  SystemRecord.lookupById(con, server.getCobblerId());
+                assertEquals(" console=tty0", rec.getKernelOptions().get());
+                assertEquals("console=tty1", rec.getKernelOptionsPost().get());
         }
 
         @Test