From e1fb5bccb4a5499ef66badde8e3a3fee8772ec9b Mon Sep 17 00:00:00 2001 From: y-oksaku <43719835+y-oksaku@users.noreply.github.com> Date: Wed, 30 Nov 2022 03:21:31 +0900 Subject: [PATCH] fix: TerminateSleep argument order (#448) --- executor/executor_test.go | 2 +- launch.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/executor/executor_test.go b/executor/executor_test.go index 2375f7e..8e2459f 100644 --- a/executor/executor_test.go +++ b/executor/executor_test.go @@ -167,7 +167,7 @@ func TestUnmocked(t *testing.T) { shell string }{ {"ls", nil, "/bin/sh"}, - {"sleep 1", nil, "/bin/sh"}, + {"echo 'foo'", nil, "/bin/sh"}, {"ls && ls ", nil, "/bin/sh"}, // Large single-line {"openssl rand -hex 1000000", nil, "/bin/sh"}, diff --git a/launch.go b/launch.go index a036e74..0a11df4 100644 --- a/launch.go +++ b/launch.go @@ -731,7 +731,7 @@ func launchAction(api screwdriver.API, buildID int, rootDir, emitterPath, metaSp } prepareExit(screwdriver.Failure, buildID, api, metaSpace, "") - TerminateSleep(sourceDir, launchShellBin, true) + TerminateSleep(launchShellBin, sourceDir, true) cleanExit() return nil }