Moving last things from /tests, removing dead code

gtardif · gtardif · commit 6859413a5d32 · 2021-01-19T15:48:48.000+01:00
Signed-off-by: Guillaume Tardif &lt;guillaume.tardif@gmail.com&gt;
diff --git a/aci/e2e/e2e-aci_test.go b/aci/e2e/e2e-aci_test.go
@@ -54,7 +54,7 @@ import (
 	"github.com/docker/compose-cli/api/context/store"
 	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/cli/cmd"
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 const (
diff --git a/ecs/e2e/ecs-local/context_test.go b/ecs/e2e/ecs-local/context_test.go
@@ -23,7 +23,7 @@ import (
 
 	"gotest.tools/v3/icmd"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 const (
diff --git a/ecs/e2e/ecs/e2e-ecs_test.go b/ecs/e2e/ecs/e2e-ecs_test.go
@@ -31,7 +31,7 @@ import (
 	"gotest.tools/v3/icmd"
 	"gotest.tools/v3/poll"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 var binDir string
diff --git a/local/e2e/cli-only/e2e_test.go b/local/e2e/cli-only/e2e_test.go
@@ -30,7 +30,7 @@ import (
 	"gotest.tools/v3/golden"
 	"gotest.tools/v3/icmd"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 var binDir string
diff --git a/local/e2e/cli-only/mockmetrics.go b/local/e2e/cli-only/mockmetrics.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package framework
+package main
 
 import (
 	"io/ioutil"
diff --git a/local/e2e/compose/compose_test.go b/local/e2e/compose/compose_test.go
@@ -27,7 +27,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/icmd"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 var binDir string
diff --git a/local/e2e/compose/logs_test.go b/local/e2e/compose/logs_test.go
@@ -24,7 +24,7 @@ import (
 
 	"gotest.tools/v3/icmd"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 func TestLocalComposeLogs(t *testing.T) {
diff --git a/local/e2e/container/container_test.go b/local/e2e/container/container_test.go
@@ -29,7 +29,7 @@ import (
 	"gotest.tools/v3/poll"
 
 	"github.com/docker/compose-cli/cli/cmd"
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 var binDir string
diff --git a/local/e2e/container/skip_win_ci_test.go b/local/e2e/container/skip_win_ci_test.go
@@ -30,7 +30,7 @@ import (
 	"gotest.tools/v3/icmd"
 	"gotest.tools/v3/poll"
 
-	. "github.com/docker/compose-cli/tests/framework"
+	. "github.com/docker/compose-cli/utils/e2e"
 )
 
 func TestKillChildProcess(t *testing.T) {
diff --git a/tests/composefiles/nginx.yaml b/tests/composefiles/nginx.yaml
diff --git a/tests/framework/unit.go b/tests/framework/unit.go
diff --git a/utils/e2e/framework.go b/utils/e2e/framework.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package framework
+package e2e
 
 import (
 	"errors"
@@ -51,6 +51,7 @@ func init() {
 }
 
 // E2eCLI is used to wrap the CLI for end to end testing
+// nolint stutter
 type E2eCLI struct {
 	BinDir    string
 	ConfigDir string

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ import (`
`54`	`54`	`"github.com/docker/compose-cli/api/context/store"`
`55`	`55`	`"github.com/docker/compose-cli/api/errdefs"`
`56`	`56`	`"github.com/docker/compose-cli/cli/cmd"`
`57`		`- . "github.com/docker/compose-cli/tests/framework"`
	`57`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`"gotest.tools/v3/icmd"`
`25`	`25`
`26`		`- . "github.com/docker/compose-cli/tests/framework"`
	`26`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"gotest.tools/v3/icmd"`
`32`	`32`	`"gotest.tools/v3/poll"`
`33`	`33`
`34`		`- . "github.com/docker/compose-cli/tests/framework"`
	`34`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`var binDir string`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`"gotest.tools/v3/golden"`
`31`	`31`	`"gotest.tools/v3/icmd"`
`32`	`32`
`33`		`- . "github.com/docker/compose-cli/tests/framework"`
	`33`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`var binDir string`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"gotest.tools/v3/assert"`
`28`	`28`	`"gotest.tools/v3/icmd"`
`29`	`29`
`30`		`- . "github.com/docker/compose-cli/tests/framework"`
	`30`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`var binDir string`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"gotest.tools/v3/icmd"`
`26`	`26`
`27`		`- . "github.com/docker/compose-cli/tests/framework"`
	`27`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func TestLocalComposeLogs(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`"gotest.tools/v3/poll"`
`30`	`30`
`31`	`31`	`"github.com/docker/compose-cli/cli/cmd"`
`32`		`- . "github.com/docker/compose-cli/tests/framework"`
	`32`	`+ . "github.com/docker/compose-cli/utils/e2e"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`var binDir string`