Properly detect scenario where highstate would create changes and tes…

…t=True. This causes the minion result key = "null" instead of a boolean. Closes JENKINS-34535
jenkinsci · May 6, 2016 · 9d93e17 · 9d93e17
1 parent 48d5fe0
commit 9d93e17
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/com/waytta/Utils.java b/src/main/java/com/waytta/Utils.java
@@ -160,7 +160,7 @@ public static boolean validateFunctionCall(JSONArray returnArray) {
                     }
                 }
 
-                // test if normla minion results are a JSONArray which indicates
+                // test if normal minion results are a JSONArray which indicates
                 // failure
                 // detect errors like
                 // "return":[{"data":{"minionname":["Rendering SLS...
@@ -212,6 +212,12 @@ private static boolean validateInnerJsonObject(JSONObject minion) {
 
                 // test if result is false
                 if (jsonObject.has("result")) {
+                    //detect where test=True and results key is "null"
+                    //See test testHighStateChangesTest
+                    if (jsonObject.get("result").equals("null")) {
+                        //deteced null result, skipping
+                        break;
+                    }
                     result = jsonObject.getBoolean("result");
 
                     if (!result) {

diff --git a/src/test/java/com/waytta/UtilsTest.java b/src/test/java/com/waytta/UtilsTest.java
@@ -264,6 +264,25 @@ public void testValidateFunctionCallForMultiPillar() {
 
         Assert.assertTrue(Utils.validateFunctionCall(jsonArray));
     }
+
+    @Test
+    public void testHighStateChangesTest() {
+    JSONArray jsonArray = JSONArray.fromObject("[{" +
+    "\"web1\": {" +
+        "\"file_|-manage ssh_known_hosts file_|-/etc/ssh/ssh_known_hosts_|-managed\": {" +
+            "\"comment\": \"The file /etc/ssh/ssh_known_hosts is set to be changed\"," +
+            "\"name\": \"/etc/ssh/ssh_known_hosts\"," +
+            "\"start_time\": \"12:32:39.060016\"," +
+            "\"result\": null," +
+            "\"duration\": 277.921," +
+            "\"__run_num__\": 9," +
+            "\"changes\": {" +
+                "\"diff\": \"diff output\"" +
+            "}" +
+        "}}}]");
+
+        Assert.assertTrue(Utils.validateFunctionCall(jsonArray));
+    }
 
     @Mock
     BuildListener listenerMock;