未验证 提交 5b6e14df 编写于 作者: A Alexander Brandes 提交者: GitHub

[JENKINS-70646] Fix `hudson.cli.ConsoleCommandTest` on macOS (#7705)

[JENKINS-70646] Fix hudson.cli.ConsoleCommandTest on macOS
上级 5507c926
...@@ -200,7 +200,7 @@ public class ConsoleCommandTest { ...@@ -200,7 +200,7 @@ public class ConsoleCommandTest {
project.getBuildersList().add(new BatchFile("echo start - %BUILD_NUMBER%\r\n" project.getBuildersList().add(new BatchFile("echo start - %BUILD_NUMBER%\r\n"
+ "ping -n 10 127.0.0.1 >nul\r\necho after sleep - %BUILD_NUMBER%")); + "ping -n 10 127.0.0.1 >nul\r\necho after sleep - %BUILD_NUMBER%"));
} else { } else {
project.getBuildersList().add(new Shell("echo start - ${BUILD_NUMBER}\nsleep 10s\n" project.getBuildersList().add(new Shell("echo start - ${BUILD_NUMBER}\nsleep 10\n"
+ "echo after sleep - ${BUILD_NUMBER}")); + "echo after sleep - ${BUILD_NUMBER}"));
} }
FreeStyleBuild build = project.scheduleBuild2(0).waitForStart(); FreeStyleBuild build = project.scheduleBuild2(0).waitForStart();
...@@ -258,7 +258,7 @@ public class ConsoleCommandTest { ...@@ -258,7 +258,7 @@ public class ConsoleCommandTest {
+ "ping -n 10 127.0.0.1 >nul\r\necho 6\r\necho 7\r\necho 8\r\necho 9")); + "ping -n 10 127.0.0.1 >nul\r\necho 6\r\necho 7\r\necho 8\r\necho 9"));
} else { } else {
project.getBuildersList().add(new Shell("echo 1\necho 2\necho 3\necho 4\necho 5\n" project.getBuildersList().add(new Shell("echo 1\necho 2\necho 3\necho 4\necho 5\n"
+ "sleep 10s\n" + "sleep 10\n"
+ "echo 6\necho 7\necho 8\necho 9")); + "echo 6\necho 7\necho 8\necho 9"));
} }
...@@ -285,7 +285,7 @@ public class ConsoleCommandTest { ...@@ -285,7 +285,7 @@ public class ConsoleCommandTest {
@Test public void consoleShouldFailIfTheBuildIsStuckInTheQueue() throws Exception { @Test public void consoleShouldFailIfTheBuildIsStuckInTheQueue() throws Exception {
FreeStyleProject project = j.createFreeStyleProject("aProject"); FreeStyleProject project = j.createFreeStyleProject("aProject");
project.getBuildersList().add(new Shell("echo 1\nsleep 10s")); project.getBuildersList().add(new Shell("echo 1\nsleep 10"));
project.setAssignedLabel(new LabelAtom("never_created")); project.setAssignedLabel(new LabelAtom("never_created"));
assertNotNull(project.scheduleBuild2(0)); assertNotNull(project.scheduleBuild2(0));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册