Merge pull request #659 from cpuguy83/move_e2e_to_internal

Move test/* to internal/test/*
2019-06-10 13:48:29 -07:00
parent c71ee814fe 0a360f54c0
commit 65b32a0fef
14 changed files with 5 additions and 5 deletions
--- a/Makefile.e2e
+++ b/Makefile.e2e
@@ -36,7 +36,7 @@ e2e: NODE_NAME := vkubelet-mock-0
 e2e: export VK_BUILD_TAGS += mock_provider
 e2e: e2e.clean bin/e2e/virtual-kubelet skaffold/run
 	@echo Running tests...
-	cd $(PWD)/test/e2e && go test -v -timeout 5m -tags e2e ./... \
+	cd $(PWD)/internal/test/e2e && go test -v -timeout 5m -tags e2e ./... \
 		-kubeconfig=$(KUBECONFIG) \
 		-namespace=$(NAMESPACE) \
 		-node-name=$(NODE_NAME) \
--- a/internal/test/e2e/basic_test.go
+++ b/internal/test/e2e/basic_test.go
--- a/internal/test/e2e/framework/env.go
+++ b/internal/test/e2e/framework/env.go
--- a/internal/test/e2e/framework/framework.go
+++ b/internal/test/e2e/framework/framework.go
--- a/internal/test/e2e/framework/node.go
+++ b/internal/test/e2e/framework/node.go
--- a/internal/test/e2e/framework/pod.go
+++ b/internal/test/e2e/framework/pod.go
--- a/internal/test/e2e/framework/stats.go
+++ b/internal/test/e2e/framework/stats.go
--- a/internal/test/e2e/main_test.go
+++ b/internal/test/e2e/main_test.go
@@ -9,7 +9,7 @@ import (

 	v1 "k8s.io/api/core/v1"

-	"github.com/virtual-kubelet/virtual-kubelet/test/e2e/framework"
+	"github.com/virtual-kubelet/virtual-kubelet/internal/test/e2e/framework"
 )

 const (
--- a/internal/test/e2e/node_test.go
+++ b/internal/test/e2e/node_test.go
--- a/internal/test/util/kubernetes.go
+++ b/internal/test/util/kubernetes.go
--- a/internal/test/util/resource_manager.go
+++ b/internal/test/util/resource_manager.go
--- a/manager/resource_test.go
+++ b/manager/resource_test.go
@@ -8,8 +8,8 @@ import (
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"

+	testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
 	"github.com/virtual-kubelet/virtual-kubelet/manager"
-	testutil "github.com/virtual-kubelet/virtual-kubelet/test/util"
 )

 // TestGetPods verifies that the resource manager acts as a passthrough to a pod lister.
--- a/vkubelet/env_internal_test.go
+++ b/vkubelet/env_internal_test.go
@@ -11,7 +11,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

-	testutil "github.com/virtual-kubelet/virtual-kubelet/test/util"
+	testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
 )

 const (
--- a/vkubelet/pod_test.go
+++ b/vkubelet/pod_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"

 	"github.com/virtual-kubelet/virtual-kubelet/errdefs"
-	testutil "github.com/virtual-kubelet/virtual-kubelet/test/util"
+	testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 	corev1 "k8s.io/api/core/v1"