back ported fix from main for ItMiiCreateAuxImageWithImageTool.testNegativeCreateAuxImageUnsupportedPM failed due to options change in imagetool.sh

marinakog · web-flow · commit 6202b9b4eb31 · 2023-03-22T13:12:41.000-04:00
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCreateAuxImageWithImageTool.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCreateAuxImageWithImageTool.java
@@ -401,8 +401,7 @@ void testNegativeCreateAuxImageUnsupportedPM() {
         .modelFiles(Collections.singletonList(MODEL_DIR + "/model.update.wm.yaml"));
 
     ExecResult result = createAuxImageUsingWITAndReturnResult(witParams);
-    String exepectedErrorMsg = "Invalid value for option '--packageManager': expected one of "
-        + "[OS_DEFAULT, NONE, YUM, DNF, MICRODNF, APTGET, APK, ZYPPER] (case-insensitive) but was 'pkm'";
+    String exepectedErrorMsg = "Invalid value for option '--packageManager':";
     assertTrue(result.exitValue() != 0 && result.stderr().contains(exepectedErrorMsg));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,7 @@ void testNegativeCreateAuxImageUnsupportedPM() {`
`401`	`401`	`.modelFiles(Collections.singletonList(MODEL_DIR + "/model.update.wm.yaml"));`
`402`	`402`
`403`	`403`	`ExecResult result = createAuxImageUsingWITAndReturnResult(witParams);`
`404`		`- String exepectedErrorMsg = "Invalid value for option '--packageManager': expected one of "`
`405`		`- + "[OS_DEFAULT, NONE, YUM, DNF, MICRODNF, APTGET, APK, ZYPPER] (case-insensitive) but was 'pkm'";`
	`404`	`+ String exepectedErrorMsg = "Invalid value for option '--packageManager':";`
`406`	`405`	`assertTrue(result.exitValue() != 0 && result.stderr().contains(exepectedErrorMsg));`
`407`	`406`	`}`
`408`	`407`