Fixing extra info on Windows (#151)

* Check the os.name before adding escape chars to extra-info Co-authored-by: aaronmray <aray10@gmail.com>
saucelabs · Dec 13, 2022 · 65c23ca · 65c23ca
1 parent 25b2248
commit 65c23ca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/com/saucelabs/ci/sauceconnect/SauceConnectFourManager.java b/src/main/java/com/saucelabs/ci/sauceconnect/SauceConnectFourManager.java
@@ -255,7 +255,13 @@ protected String[] generateSauceConnectArgs(String[] args, String username, Stri
     }
 
     protected String[] addExtraInfo(String[] args) {
-        String[] result = joinArgs(args, "--extra-info", "{\"runner\": \"jenkins\"}");
+        String[] result;
+        OperatingSystem operatingSystem = OperatingSystem.getOperatingSystem();
+        if (operatingSystem == OperatingSystem.WINDOWS) {
+            result = joinArgs(args, "--extra-info", "{\\\"runner\\\": \\\"jenkins\\\"}");
+        } else {
+            result = joinArgs(args, "--extra-info", "{\"runner\": \"jenkins\"}");
+        }
         return result;
     }
 

diff --git a/src/test/java/com/saucelabs/ci/sauceconnect/SauceConnectFourManagerTest.java b/src/test/java/com/saucelabs/ci/sauceconnect/SauceConnectFourManagerTest.java
@@ -114,7 +114,12 @@ private Process testDefaultOpenConnection(String logFile, String username) throw
             assertEquals("-P", actualArgs[5]);
             assertEquals(Integer.toString(port), actualArgs[6]);
             assertEquals("--extra-info", actualArgs[7]);
-            assertEquals("{\"runner\": \"jenkins\"}", actualArgs[8]);
+            OperatingSystem operatingSystem = OperatingSystem.getOperatingSystem();
+            if (operatingSystem == OperatingSystem.WINDOWS) {
+                assertEquals("{\\\"runner\\\": \\\"jenkins\\\"}", actualArgs[8]);
+            } else {
+                assertEquals("{\"runner\": \"jenkins\"}", actualArgs[8]);
+            }
         }
     }
 
@@ -141,7 +146,12 @@ private Process testOpenConnection(String logFile, String username) throws IOExc
             assertEquals("-P", actualArgs[5]);
             assertEquals(Integer.toString(port), actualArgs[6]);
             assertEquals("--extra-info", actualArgs[7]);
-            assertEquals("{\"runner\": \"jenkins\"}", actualArgs[8]);
+            OperatingSystem operatingSystem = OperatingSystem.getOperatingSystem();
+            if (operatingSystem == OperatingSystem.WINDOWS) {
+                assertEquals("{\\\"runner\\\": \\\"jenkins\\\"}", actualArgs[8]);
+            } else {
+                assertEquals("{\"runner\": \"jenkins\"}", actualArgs[8]);
+            }
         }
     }