Kill off pkg/dtest

pkg/dtest was github.com/datawire/dtest plus a few things; now those "plus a few things" aren't used anymore, so things can just use github.com/datawire/dtest directly. Signed-off-by: Luke Shumaker <[email protected]>
emissary-ingress · May 2, 2022 · 09ecd8e · 09ecd8e
1 parent b494d99
commit 09ecd8e
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 229 deletions.
diff --git a/cmd/agent/agent_test.go b/cmd/agent/agent_test.go
@@ -17,12 +17,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/datawire/ambassador/v2/pkg/api/agent"
-	"github.com/datawire/ambassador/v2/pkg/dtest"
 	"github.com/datawire/ambassador/v2/pkg/kates"
 	"github.com/datawire/ambassador/v2/pkg/kubeapply"
 	snapshotTypes "github.com/datawire/ambassador/v2/pkg/snapshot/v1"
 	"github.com/datawire/dlib/dexec"
 	"github.com/datawire/dlib/dlog"
+	"github.com/datawire/dtest"
 )
 
 // This test is supposed to be a very lightweight end to end test.

diff --git a/pkg/dtest/k3s.go b/pkg/dtest/k3s.go
diff --git a/pkg/dtest/k8sapply.go b/pkg/dtest/k8sapply.go
diff --git a/pkg/dtest/sudo.go b/pkg/dtest/sudo.go
diff --git a/pkg/dtest/testprocess/tp.go b/pkg/dtest/testprocess/tp.go
diff --git a/pkg/kates/client_test.go b/pkg/kates/client_test.go
@@ -15,14 +15,14 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/datawire/dlib/dlog"
-	dtest_k3s "github.com/datawire/dtest"
+	"github.com/datawire/dtest"
 )
 
 func testClient(t *testing.T, ctx context.Context) (context.Context, *Client) {
 	if ctx == nil {
 		ctx = dlog.NewTestContext(t, false)
 	}
-	cli, err := NewClient(ClientConfig{Kubeconfig: dtest_k3s.KubeVersionConfig(ctx, dtest_k3s.Kube22)})
+	cli, err := NewClient(ClientConfig{Kubeconfig: dtest.KubeVersionConfig(ctx, dtest.Kube22)})
 	require.NoError(t, err)
 	return ctx, cli
 }

diff --git a/pkg/kubeapply/resource_kubeapply_test.go b/pkg/kubeapply/resource_kubeapply_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/datawire/ambassador/v2/pkg/dtest"
 	"github.com/datawire/ambassador/v2/pkg/kubeapply"
 	"github.com/datawire/dlib/dexec"
 	"github.com/datawire/dlib/dlog"
+	"github.com/datawire/dtest"
 )
 
 func needsDocker(t *testing.T) {