From df831db36095bb1182b9d0188f69c0a3fcbdb246 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 21 Jan 2017 23:20:51 -0500 Subject: [PATCH] Break dependency on testapi from core packages --- pkg/client/cache/listwatch_test.go | 3 ++- pkg/client/typed/discovery/discovery_client_test.go | 3 ++- pkg/client/typed/discovery/restmapper_test.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 2f5b04969d1..384eeeb707d 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cache +package cache_test import ( "net/http/httptest" @@ -31,6 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" + . "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" ) diff --git a/pkg/client/typed/discovery/discovery_client_test.go b/pkg/client/typed/discovery/discovery_client_test.go index 26b2f95075f..125c9eb46f4 100644 --- a/pkg/client/typed/discovery/discovery_client_test.go +++ b/pkg/client/typed/discovery/discovery_client_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package discovery +package discovery_test import ( "encoding/json" @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/version" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api/v1" + . "k8s.io/kubernetes/pkg/client/typed/discovery" ) func TestGetServerVersion(t *testing.T) { diff --git a/pkg/client/typed/discovery/restmapper_test.go b/pkg/client/typed/discovery/restmapper_test.go index 880c5214e90..bf2633ae9c9 100644 --- a/pkg/client/typed/discovery/restmapper_test.go +++ b/pkg/client/typed/discovery/restmapper_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package discovery +package discovery_test import ( "reflect" @@ -27,6 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient/fake" + . "k8s.io/kubernetes/pkg/client/typed/discovery" "github.com/emicklei/go-restful/swagger" "github.com/stretchr/testify/assert"