From 7d8813a96c840328fb8b1b86c441ed56acb3ff2c Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Sat, 25 Aug 2018 10:20:48 -0700 Subject: [PATCH] move ObjectStore mock into pkg/cloudprovider/mocks Signed-off-by: Steve Kriss --- .../test => cloudprovider/mocks}/object_store.go | 4 ++-- pkg/persistence/object_store_test.go | 3 ++- pkg/plugin/restartable_object_store_test.go | 13 +++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) rename pkg/{util/test => cloudprovider/mocks}/object_store.go (98%) diff --git a/pkg/util/test/object_store.go b/pkg/cloudprovider/mocks/object_store.go similarity index 98% rename from pkg/util/test/object_store.go rename to pkg/cloudprovider/mocks/object_store.go index 3a7f9104e..ed4129b1f 100644 --- a/pkg/util/test/object_store.go +++ b/pkg/cloudprovider/mocks/object_store.go @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by mockery v1.0.0 -package test +// Code generated by mockery v1.0.0. DO NOT EDIT. +package mocks import io "io" import mock "github.com/stretchr/testify/mock" diff --git a/pkg/persistence/object_store_test.go b/pkg/persistence/object_store_test.go index 6f2e27cbf..07337ce9a 100644 --- a/pkg/persistence/object_store_test.go +++ b/pkg/persistence/object_store_test.go @@ -33,6 +33,7 @@ import ( api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cloudprovider" + cloudprovidermocks "github.com/heptio/ark/pkg/cloudprovider/mocks" "github.com/heptio/ark/pkg/util/encode" arktest "github.com/heptio/ark/pkg/util/test" ) @@ -265,7 +266,7 @@ func TestDeleteBackup(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - objectStore := new(arktest.ObjectStore) + objectStore := new(cloudprovidermocks.ObjectStore) backupStore := &objectBackupStore{ objectStore: objectStore, bucket: "test-bucket", diff --git a/pkg/plugin/restartable_object_store_test.go b/pkg/plugin/restartable_object_store_test.go index 206866063..3c3b80160 100644 --- a/pkg/plugin/restartable_object_store_test.go +++ b/pkg/plugin/restartable_object_store_test.go @@ -22,10 +22,11 @@ import ( "testing" "time" - "github.com/heptio/ark/pkg/util/test" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + cloudprovidermocks "github.com/heptio/ark/pkg/cloudprovider/mocks" ) func TestRestartableGetObjectStore(t *testing.T) { @@ -47,7 +48,7 @@ func TestRestartableGetObjectStore(t *testing.T) { }, { name: "happy path", - plugin: new(test.ObjectStore), + plugin: new(cloudprovidermocks.ObjectStore), }, } @@ -95,7 +96,7 @@ func TestRestartableObjectStoreReinitialize(t *testing.T) { err := r.reinitialize(3) assert.EqualError(t, err, "int is not a cloudprovider.ObjectStore!") - objectStore := new(test.ObjectStore) + objectStore := new(cloudprovidermocks.ObjectStore) objectStore.Test(t) defer objectStore.AssertExpectations(t) @@ -127,7 +128,7 @@ func TestRestartableObjectStoreGetDelegate(t *testing.T) { // Happy path p.On("resetIfNeeded").Return(nil) - objectStore := new(test.ObjectStore) + objectStore := new(cloudprovidermocks.ObjectStore) objectStore.Test(t) defer objectStore.AssertExpectations(t) p.On("getByKindAndName", key).Return(objectStore, nil) @@ -158,7 +159,7 @@ func TestRestartableObjectStoreInit(t *testing.T) { assert.EqualError(t, err, "getByKindAndName error") // Delegate returns error - objectStore := new(test.ObjectStore) + objectStore := new(cloudprovidermocks.ObjectStore) objectStore.Test(t) defer objectStore.AssertExpectations(t) p.On("getByKindAndName", key).Return(objectStore, nil) @@ -192,7 +193,7 @@ func TestRestartableObjectStoreDelegatedFunctions(t *testing.T) { } }, func() mockable { - return new(test.ObjectStore) + return new(cloudprovidermocks.ObjectStore) }, restartableDelegateTest{ function: "PutObject",