mirror of https://github.com/docker/cli.git
refactor: remove test
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
This commit is contained in:
parent
1322f585fe
commit
faf7647dcf
|
@ -1,28 +1,17 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
|
||||||
"os/signal"
|
|
||||||
"strings"
|
|
||||||
"syscall"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/debug"
|
"github.com/docker/cli/cli/debug"
|
||||||
"github.com/docker/cli/cli/streams"
|
|
||||||
"github.com/docker/cli/cmd/docker/internal/signals"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"gotest.tools/v3/assert"
|
"gotest.tools/v3/assert"
|
||||||
is "gotest.tools/v3/assert/cmp"
|
is "gotest.tools/v3/assert/cmp"
|
||||||
"gotest.tools/v3/poll"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestClientDebugEnabled(t *testing.T) {
|
func TestClientDebugEnabled(t *testing.T) {
|
||||||
|
@ -86,92 +75,3 @@ func TestVersion(t *testing.T) {
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
assert.Check(t, is.Contains(b.String(), "Docker version"))
|
assert.Check(t, is.Contains(b.String(), "Docker version"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFallbackForceExit(t *testing.T) {
|
|
||||||
longRunningCommand := cobra.Command{
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
read, _, err := os.Pipe()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// wait until the parent process sends a signal to exit
|
|
||||||
_, _, err = bufio.NewReader(read).ReadLine()
|
|
||||||
return err
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the child process that will run the long running command
|
|
||||||
if os.Getenv("TEST_FALLBACK_FORCE_EXIT") == "1" {
|
|
||||||
fmt.Println("running long command")
|
|
||||||
ctx, cancel := signal.NotifyContext(context.Background(), signals.TerminationSignals...)
|
|
||||||
t.Cleanup(cancel)
|
|
||||||
|
|
||||||
longRunningCommand.SetErr(streams.NewOut(os.Stderr))
|
|
||||||
longRunningCommand.SetOut(streams.NewOut(os.Stdout))
|
|
||||||
|
|
||||||
go forceExitAfter3TerminationSignals(ctx, streams.NewOut(os.Stderr))
|
|
||||||
|
|
||||||
err := longRunningCommand.ExecuteContext(ctx)
|
|
||||||
if err != nil {
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
t.Cleanup(cancel)
|
|
||||||
|
|
||||||
// spawn the child process
|
|
||||||
cmd := exec.CommandContext(ctx, os.Args[0], "-test.run=TestFallbackForceExit")
|
|
||||||
cmd.Env = append(os.Environ(), "TEST_FALLBACK_FORCE_EXIT=1")
|
|
||||||
|
|
||||||
var buf strings.Builder
|
|
||||||
cmd.Stderr = &buf
|
|
||||||
cmd.Stdout = &buf
|
|
||||||
|
|
||||||
t.Cleanup(func() {
|
|
||||||
_ = cmd.Process.Kill()
|
|
||||||
})
|
|
||||||
|
|
||||||
assert.NilError(t, cmd.Start())
|
|
||||||
|
|
||||||
poll.WaitOn(t, func(t poll.LogT) poll.Result {
|
|
||||||
if strings.Contains(buf.String(), "running long command") {
|
|
||||||
return poll.Success()
|
|
||||||
}
|
|
||||||
return poll.Continue("waiting for child process to start")
|
|
||||||
}, poll.WithTimeout(1*time.Second), poll.WithDelay(100*time.Millisecond))
|
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
cmd.Process.Signal(syscall.SIGINT)
|
|
||||||
time.Sleep(100 * time.Millisecond)
|
|
||||||
}
|
|
||||||
|
|
||||||
cmdErr := make(chan error, 1)
|
|
||||||
go func() {
|
|
||||||
cmdErr <- cmd.Wait()
|
|
||||||
}()
|
|
||||||
|
|
||||||
poll.WaitOn(t, func(t poll.LogT) poll.Result {
|
|
||||||
if strings.Contains(buf.String(), "got 3 SIGTERM/SIGINTs, forcefully exiting") {
|
|
||||||
return poll.Success()
|
|
||||||
}
|
|
||||||
return poll.Continue("waiting for child process to exit")
|
|
||||||
},
|
|
||||||
poll.WithTimeout(1*time.Second), poll.WithDelay(100*time.Millisecond))
|
|
||||||
|
|
||||||
select {
|
|
||||||
case cmdErr := <-cmdErr:
|
|
||||||
assert.Error(t, cmdErr, "exit status 1")
|
|
||||||
exitErr, ok := cmdErr.(*exec.ExitError)
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("unexpected error type: %T", cmdErr)
|
|
||||||
}
|
|
||||||
if exitErr.Success() {
|
|
||||||
t.Fatalf("unexpected exit status: %v", exitErr)
|
|
||||||
}
|
|
||||||
case <-time.After(1 * time.Second):
|
|
||||||
t.Fatal("timed out waiting for child process to exit")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue