|
|
@@ -29,8 +29,6 @@ package main
|
|
|
|
|
|
import (
|
|
|
"fmt"
|
|
|
- . "github.com/onsi/gomega"
|
|
|
- "github.com/stretchr/testify/suite"
|
|
|
"io/ioutil"
|
|
|
"log"
|
|
|
"os"
|
|
|
@@ -40,6 +38,9 @@ import (
|
|
|
"testing"
|
|
|
"time"
|
|
|
|
|
|
+ . "github.com/onsi/gomega"
|
|
|
+ "github.com/stretchr/testify/suite"
|
|
|
+
|
|
|
"gotest.tools/golden"
|
|
|
|
|
|
. "github.com/docker/api/tests/framework"
|
|
|
@@ -91,7 +92,7 @@ func (s *E2eSuite) TestKillChildOnCancel() {
|
|
|
RUN sleep 100`), 0644)).To(Succeed())
|
|
|
shutdown := make(chan time.Time)
|
|
|
errs := make(chan error)
|
|
|
- ctx := s.NewDockerCommand("build", "--no-cache", "-t", "test-sleep-image", ".").WithinDirectory(dir).WithTimeout(shutdown)
|
|
|
+ ctx := s.NewDockerCommand("build", "--no-cache", "-t", "test-sleep-image", ".").WithinDirectory(dir).WithTimeout(shutdown)
|
|
|
go func() {
|
|
|
_, err := ctx.Exec()
|
|
|
errs <- err
|