From 9445f80dd923af630c7cd648e6219e509a17d75e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Aug 2023 14:30:45 -0400 Subject: [PATCH] Reviewed `switch`es on `platform` and aligned `ON_CONTROLLER` with `NATIVE` --- .../jenkinsci/plugins/durabletask/BourneShellScriptTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java index 17c7f901..c1d7d306 100644 --- a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java +++ b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java @@ -130,6 +130,7 @@ public BourneShellScriptTest(TestPlatform platform) throws Exception { @Before public void prepareAgentForPlatform() throws Exception { switch (platform) { case ON_CONTROLLER: + BourneShellScript.USE_BINARY_WRAPPER = true; s = j.jenkins; break; case NATIVE: @@ -212,6 +213,7 @@ private Slave prepareDockerPlatforms() throws Exception { @Test public void smokeTest() throws Exception { int sleepSeconds; switch (platform) { + case ON_CONTROLLER: case NATIVE: sleepSeconds = 0; break; @@ -438,6 +440,7 @@ static class MockHandler extends Handler { @Test public void backgroundLaunch() throws IOException, InterruptedException { int sleepSeconds; switch (platform) { + case ON_CONTROLLER: case NATIVE: case CENTOS: case UBUNTU: @@ -483,6 +486,7 @@ static class MockHandler extends Handler { String os; String architecture; switch (platform) { + case ON_CONTROLLER: case NATIVE: if (Platform.isDarwin()) { os = "darwin"; @@ -608,6 +612,7 @@ private String psOut(String psFormat) throws InterruptedException, IOException { private String setPsFormat() { String cmdCol = null; switch (platform) { + case ON_CONTROLLER: case NATIVE: cmdCol = Platform.isDarwin() ? "comm" : "cmd"; break;