From 7e52b33bf8a3e2ba8d1fe00e3fbc205d87cea93f Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 21 Mar 2019 23:49:08 -0700 Subject: [PATCH] integration: generalize pkg Signed-off-by: Tonis Tiigi --- client/build_test.go | 5 +++++ client/client_test.go | 5 +++++ cmd/buildctl/buildctl_test.go | 5 +++++ frontend/dockerfile/dockerfile_test.go | 5 +++++ frontend/frontend_test.go | 5 +++++ util/testutil/integration/containerd.go | 6 +++--- util/testutil/integration/oci.go | 8 ++++---- util/testutil/integration/registry.go | 2 +- util/testutil/integration/run.go | 12 ++++++++++-- 9 files changed, 43 insertions(+), 10 deletions(-) diff --git a/client/build_test.go b/client/build_test.go index 2071e585..a0e3d30f 100644 --- a/client/build_test.go +++ b/client/build_test.go @@ -16,6 +16,11 @@ import ( "github.com/stretchr/testify/require" ) +func init() { + integration.InitOCIWorker() + integration.InitContainerdWorker() +} + func TestClientGatewayIntegration(t *testing.T) { integration.Run(t, []integration.Test{ testClientGatewaySolve, diff --git a/client/client_test.go b/client/client_test.go index 1eca18b4..db0fd62c 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -44,6 +44,11 @@ import ( "golang.org/x/sync/errgroup" ) +func init() { + integration.InitOCIWorker() + integration.InitContainerdWorker() +} + type nopWriteCloser struct { io.Writer } diff --git a/cmd/buildctl/buildctl_test.go b/cmd/buildctl/buildctl_test.go index 6e9aa672..bc8b0609 100644 --- a/cmd/buildctl/buildctl_test.go +++ b/cmd/buildctl/buildctl_test.go @@ -7,6 +7,11 @@ import ( "github.com/stretchr/testify/require" ) +func init() { + integration.InitOCIWorker() + integration.InitContainerdWorker() +} + func TestCLIIntegration(t *testing.T) { integration.Run(t, []integration.Test{ testDiskUsage, diff --git a/frontend/dockerfile/dockerfile_test.go b/frontend/dockerfile/dockerfile_test.go index 6b0d8ee4..2013764d 100644 --- a/frontend/dockerfile/dockerfile_test.go +++ b/frontend/dockerfile/dockerfile_test.go @@ -39,6 +39,11 @@ import ( "github.com/stretchr/testify/require" ) +func init() { + integration.InitOCIWorker() + integration.InitContainerdWorker() +} + var allTests = []integration.Test{ testCmdShell, testGlobalArg, diff --git a/frontend/frontend_test.go b/frontend/frontend_test.go index 4405650c..29b2b467 100644 --- a/frontend/frontend_test.go +++ b/frontend/frontend_test.go @@ -23,6 +23,11 @@ var ( errFailed = errors.New("test failed") ) +func init() { + integration.InitOCIWorker() + integration.InitContainerdWorker() +} + func TestFrontendIntegration(t *testing.T) { integration.Run(t, []integration.Test{ testRefReadFile, diff --git a/util/testutil/integration/containerd.go b/util/testutil/integration/containerd.go index 7751830c..b12ffbd9 100644 --- a/util/testutil/integration/containerd.go +++ b/util/testutil/integration/containerd.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" ) -func init() { - register(&containerd{ +func InitContainerdWorker() { + Register(&containerd{ name: "containerd", containerd: "containerd", containerdShim: "containerd-shim", @@ -29,7 +29,7 @@ func init() { panic(errors.Errorf("unexpected BUILDKIT_INTEGRATION_CONTAINERD_EXTRA: %q", s)) } name, bin := pair[0], pair[1] - register(&containerd{ + Register(&containerd{ name: name, containerd: filepath.Join(bin, "containerd"), containerdShim: filepath.Join(bin, "containerd-shim"), diff --git a/util/testutil/integration/oci.go b/util/testutil/integration/oci.go index c06ff053..ad5daa99 100644 --- a/util/testutil/integration/oci.go +++ b/util/testutil/integration/oci.go @@ -18,8 +18,8 @@ import ( "github.com/sirupsen/logrus" ) -func init() { - register(&oci{}) +func InitOCIWorker() { + Register(&oci{}) // the rootless uid is defined in hack/dockerfiles/test.Dockerfile if s := os.Getenv("BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR"); s != "" { @@ -28,7 +28,7 @@ func init() { logrus.Fatalf("unexpected BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR: %q", s) } if rootlessSupported(uid) { - register(&oci{uid: uid, gid: gid}) + Register(&oci{uid: uid, gid: gid}) } } @@ -117,7 +117,7 @@ func (sb *sandbox) PrintLogs(t *testing.T) { } func (sb *sandbox) NewRegistry() (string, error) { - url, cl, err := newRegistry("") + url, cl, err := NewRegistry("") if err != nil { return "", err } diff --git a/util/testutil/integration/registry.go b/util/testutil/integration/registry.go index be74ad5b..8e76f55e 100644 --- a/util/testutil/integration/registry.go +++ b/util/testutil/integration/registry.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" ) -func newRegistry(dir string) (url string, cl func() error, err error) { +func NewRegistry(dir string) (url string, cl func() error, err error) { if err := lookupBinary("registry"); err != nil { return "", nil, err } diff --git a/util/testutil/integration/run.go b/util/testutil/integration/run.go index a3223a2c..7eabab72 100644 --- a/util/testutil/integration/run.go +++ b/util/testutil/integration/run.go @@ -44,6 +44,14 @@ type SandboxConf struct { mv matrixValue } +func (sc *SandboxConf) Mirror() string { + return sc.mirror +} + +func (sc *SandboxConf) Value(k string) interface{} { + return sc.mv.values[k].value +} + type SandboxOpt func(*SandboxConf) func WithMirror(h string) SandboxOpt { @@ -62,7 +70,7 @@ type Test func(*testing.T, Sandbox) var defaultWorkers []Worker -func register(w Worker) { +func Register(w Worker) { defaultWorkers = append(defaultWorkers, w) } @@ -267,7 +275,7 @@ func runMirror(t *testing.T, mirroredImages map[string]string) (host string, _ f } } - mirror, cleanup, err := newRegistry(mirrorDir) + mirror, cleanup, err := NewRegistry(mirrorDir) if err != nil { return "", nil, err }