Skip to content

Fix flaky launcher test #2758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pipecd-bot merged 2 commits into from
Nov 8, 2021
Merged

Fix flaky launcher test #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7323a6f
Fix flaky launcher test
khanhtc1202 Nov 8, 2021
de5214b
wait for stopCh before return
khanhtc1202 Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/app/launcher/cmd/launcher/binary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (c *command) GracefulStop(period time.Duration) error {
select {
case <-timer.C:
c.cmd.Process.Kill()
return nil
return <-c.stoppedCh
case err := <-c.stoppedCh:
return err
}
Expand Down
32 changes: 25 additions & 7 deletions pkg/app/launcher/cmd/launcher/binary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,30 @@ import (
"github.com/stretchr/testify/require"
)

func TestCommand(t *testing.T) {
cmd, err := runBinary("sh", []string{"sleep", "1m"})
require.NoError(t, err)
require.NotNil(t, cmd)
func TestGracefulStopCommand(t *testing.T) {
testcases := []struct {
name string
stopAfter time.Duration
}{
{
name: "graceful stop after very short time",
stopAfter: time.Nanosecond,
},
{
name: "graceful stop after second",
stopAfter: time.Second,
},
}

assert.True(t, cmd.IsRunning())
cmd.GracefulStop(time.Millisecond)
assert.False(t, cmd.IsRunning())
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
cmd, err := runBinary("sh", []string{"sleep", "1m"})
require.NoError(t, err)
require.NotNil(t, cmd)

assert.True(t, cmd.IsRunning())
cmd.GracefulStop(tc.stopAfter)
assert.False(t, cmd.IsRunning())
})
}
}