From adaa2246e7eab75c36c22be75de2a43dff5e7aeb Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Mon, 5 Jan 2015 16:53:13 -0800 Subject: [PATCH] Move testutil package to top-level Since the common package no longer exists, the testutil package is being moved up to the root. Ideally, we don't have large omnibus packages, like testutil, but we can fix that in another refactoring round. Signed-off-by: Stephen J Day --- api_test.go | 2 +- client/client_test.go | 2 +- digest/verifiers_test.go | 2 +- storage/layer_test.go | 2 +- {common/testutil => testutil}/handler.go | 0 {common/testutil => testutil}/tarfile.go | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename {common/testutil => testutil}/handler.go (100%) rename {common/testutil => testutil}/tarfile.go (100%) diff --git a/api_test.go b/api_test.go index 6e8c403c7..5d05e77f4 100644 --- a/api_test.go +++ b/api_test.go @@ -14,11 +14,11 @@ import ( "testing" "github.com/docker/distribution/api/v2" - "github.com/docker/distribution/common/testutil" "github.com/docker/distribution/configuration" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" _ "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/testutil" "github.com/docker/libtrust" "github.com/gorilla/handlers" ) diff --git a/client/client_test.go b/client/client_test.go index 76867bcfd..65e73f34b 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" - "github.com/docker/distribution/common/testutil" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" + "github.com/docker/distribution/testutil" ) type testBlob struct { diff --git a/digest/verifiers_test.go b/digest/verifiers_test.go index 5d595ec14..939a8c816 100644 --- a/digest/verifiers_test.go +++ b/digest/verifiers_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/docker/distribution/common/testutil" + "github.com/docker/distribution/testutil" ) func TestDigestVerifier(t *testing.T) { diff --git a/storage/layer_test.go b/storage/layer_test.go index 166d803a7..5d985d682 100644 --- a/storage/layer_test.go +++ b/storage/layer_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/docker/distribution/common/testutil" "github.com/docker/distribution/digest" "github.com/docker/distribution/storagedriver" "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/testutil" ) // TestSimpleLayerUpload covers the layer upload process, exercising common diff --git a/common/testutil/handler.go b/testutil/handler.go similarity index 100% rename from common/testutil/handler.go rename to testutil/handler.go diff --git a/common/testutil/tarfile.go b/testutil/tarfile.go similarity index 100% rename from common/testutil/tarfile.go rename to testutil/tarfile.go