From ffa3251efc7551b4ba560e53af07d573fc9d7434 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Thu, 1 Aug 2019 09:19:18 -0600 Subject: [PATCH] move contents of pkg/util/test into pkg/test Signed-off-by: Steve Kriss --- pkg/backup/backup_pv_action_test.go | 2 +- pkg/backup/backup_test.go | 2 +- pkg/backup/item_hook_handler_test.go | 2 +- pkg/backup/pod_action_test.go | 2 +- pkg/backup/service_account_action_test.go | 2 +- pkg/cloudprovider/aws/object_store_test.go | 2 +- pkg/cloudprovider/gcp/object_store_test.go | 2 +- pkg/cloudprovider/gcp/volume_snapshotter_test.go | 2 +- pkg/cmd/cli/restic/server_test.go | 2 +- pkg/cmd/server/server_test.go | 2 +- pkg/controller/backup_deletion_controller_test.go | 2 +- pkg/controller/backup_sync_controller_test.go | 2 +- pkg/controller/download_request_controller_test.go | 2 +- pkg/controller/gc_controller_test.go | 2 +- pkg/controller/pod_volume_backup_controller_test.go | 2 +- pkg/controller/pod_volume_restore_controller_test.go | 2 +- pkg/controller/restore_controller_test.go | 2 +- pkg/controller/schedule_controller_test.go | 2 +- pkg/discovery/helper_test.go | 2 +- pkg/persistence/object_store_test.go | 2 +- pkg/plugin/clientmgmt/client_builder_test.go | 2 +- pkg/plugin/clientmgmt/manager_test.go | 2 +- pkg/plugin/clientmgmt/registry_test.go | 2 +- pkg/plugin/framework/backup_item_action_test.go | 2 +- pkg/plugin/framework/client_dispenser_test.go | 2 +- pkg/plugin/framework/plugin_base_test.go | 2 +- pkg/podexec/pod_command_executor_test.go | 2 +- pkg/restic/common_test.go | 2 +- pkg/restore/add_pv_from_pvc_action_test.go | 2 +- pkg/restore/add_pvc_from_pod_action_test.go | 2 +- pkg/restore/job_action_test.go | 2 +- pkg/restore/merge_service_account_test.go | 2 +- pkg/restore/pod_action_test.go | 2 +- pkg/restore/pv_restorer_test.go | 2 +- pkg/restore/restic_restore_action_test.go | 2 +- pkg/restore/restore_test.go | 2 +- pkg/restore/service_account_action_test.go | 2 +- pkg/restore/service_action_test.go | 2 +- pkg/{util => }/test/comparisons.go | 0 pkg/{util => }/test/fake_discovery_helper.go | 0 pkg/{util => }/test/fake_dynamic.go | 0 pkg/{util => }/test/fake_file_system.go | 0 pkg/{util => }/test/fake_mapper.go | 0 pkg/{util => }/test/fake_namespace.go | 0 pkg/{util => }/test/fake_volume_snapshotter.go | 0 pkg/{util => }/test/helpers.go | 0 pkg/{util => }/test/mock_pod_command_executor.go | 0 pkg/{util => }/test/test_logger.go | 0 pkg/util/kube/utils_test.go | 2 +- 49 files changed, 39 insertions(+), 39 deletions(-) rename pkg/{util => }/test/comparisons.go (100%) rename pkg/{util => }/test/fake_discovery_helper.go (100%) rename pkg/{util => }/test/fake_dynamic.go (100%) rename pkg/{util => }/test/fake_file_system.go (100%) rename pkg/{util => }/test/fake_mapper.go (100%) rename pkg/{util => }/test/fake_namespace.go (100%) rename pkg/{util => }/test/fake_volume_snapshotter.go (100%) rename pkg/{util => }/test/helpers.go (100%) rename pkg/{util => }/test/mock_pod_command_executor.go (100%) rename pkg/{util => }/test/test_logger.go (100%) diff --git a/pkg/backup/backup_pv_action_test.go b/pkg/backup/backup_pv_action_test.go index ef492e97b..f81873d2b 100644 --- a/pkg/backup/backup_pv_action_test.go +++ b/pkg/backup/backup_pv_action_test.go @@ -27,7 +27,7 @@ import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestBackupPVAction(t *testing.T) { diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go index eda3b1809..35b89bd36 100644 --- a/pkg/backup/backup_test.go +++ b/pkg/backup/backup_test.go @@ -48,8 +48,8 @@ import ( "github.com/heptio/velero/pkg/plugin/velero" "github.com/heptio/velero/pkg/restic" "github.com/heptio/velero/pkg/test" + testutil "github.com/heptio/velero/pkg/test" kubeutil "github.com/heptio/velero/pkg/util/kube" - testutil "github.com/heptio/velero/pkg/util/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/backup/item_hook_handler_test.go b/pkg/backup/item_hook_handler_test.go index 85b021099..9aa787e37 100644 --- a/pkg/backup/item_hook_handler_test.go +++ b/pkg/backup/item_hook_handler_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/collections" - velerotest "github.com/heptio/velero/pkg/util/test" ) type mockItemHookHandler struct { diff --git a/pkg/backup/pod_action_test.go b/pkg/backup/pod_action_test.go index c933aeb8c..59f1c6404 100644 --- a/pkg/backup/pod_action_test.go +++ b/pkg/backup/pod_action_test.go @@ -25,7 +25,7 @@ import ( "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestPodActionAppliesTo(t *testing.T) { diff --git a/pkg/backup/service_account_action_test.go b/pkg/backup/service_account_action_test.go index 152fee309..44f723aca 100644 --- a/pkg/backup/service_account_action_test.go +++ b/pkg/backup/service_account_action_test.go @@ -30,7 +30,7 @@ import ( "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func newV1ClusterRoleBindingList(rbacCRBList []rbac.ClusterRoleBinding) []ClusterRoleBinding { diff --git a/pkg/cloudprovider/aws/object_store_test.go b/pkg/cloudprovider/aws/object_store_test.go index 0dbc0b5be..e66ebbe3c 100644 --- a/pkg/cloudprovider/aws/object_store_test.go +++ b/pkg/cloudprovider/aws/object_store_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) func TestIsValidSignatureVersion(t *testing.T) { diff --git a/pkg/cloudprovider/gcp/object_store_test.go b/pkg/cloudprovider/gcp/object_store_test.go index e9ca7c53a..b483e1bc6 100644 --- a/pkg/cloudprovider/gcp/object_store_test.go +++ b/pkg/cloudprovider/gcp/object_store_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) type mockWriteCloser struct { diff --git a/pkg/cloudprovider/gcp/volume_snapshotter_test.go b/pkg/cloudprovider/gcp/volume_snapshotter_test.go index c8d77f598..f14cdde72 100644 --- a/pkg/cloudprovider/gcp/volume_snapshotter_test.go +++ b/pkg/cloudprovider/gcp/volume_snapshotter_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestGetVolumeID(t *testing.T) { diff --git a/pkg/cmd/cli/restic/server_test.go b/pkg/cmd/cli/restic/server_test.go index a71fe2184..b1c1367ff 100644 --- a/pkg/cmd/cli/restic/server_test.go +++ b/pkg/cmd/cli/restic/server_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/kubernetes/fake" "github.com/heptio/velero/pkg/builder" - testutil "github.com/heptio/velero/pkg/util/test" + testutil "github.com/heptio/velero/pkg/test" ) func Test_validatePodVolumesHostPath(t *testing.T) { diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 4b15965cf..fd9cd24a3 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "github.com/heptio/velero/pkg/apis/velero/v1" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestVeleroResourcesExist(t *testing.T) { diff --git a/pkg/controller/backup_deletion_controller_test.go b/pkg/controller/backup_deletion_controller_test.go index b96733381..b888776ac 100644 --- a/pkg/controller/backup_deletion_controller_test.go +++ b/pkg/controller/backup_deletion_controller_test.go @@ -42,7 +42,7 @@ import ( persistencemocks "github.com/heptio/velero/pkg/persistence/mocks" "github.com/heptio/velero/pkg/plugin/clientmgmt" pluginmocks "github.com/heptio/velero/pkg/plugin/mocks" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/controller/backup_sync_controller_test.go b/pkg/controller/backup_sync_controller_test.go index 984bc4115..e1bc9e066 100644 --- a/pkg/controller/backup_sync_controller_test.go +++ b/pkg/controller/backup_sync_controller_test.go @@ -40,7 +40,7 @@ import ( persistencemocks "github.com/heptio/velero/pkg/persistence/mocks" "github.com/heptio/velero/pkg/plugin/clientmgmt" pluginmocks "github.com/heptio/velero/pkg/plugin/mocks" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func defaultLocationsList(namespace string) []*velerov1api.BackupStorageLocation { diff --git a/pkg/controller/download_request_controller_test.go b/pkg/controller/download_request_controller_test.go index d1822cc6d..7a0dcc36c 100644 --- a/pkg/controller/download_request_controller_test.go +++ b/pkg/controller/download_request_controller_test.go @@ -35,8 +35,8 @@ import ( persistencemocks "github.com/heptio/velero/pkg/persistence/mocks" "github.com/heptio/velero/pkg/plugin/clientmgmt" pluginmocks "github.com/heptio/velero/pkg/plugin/mocks" + velerotest "github.com/heptio/velero/pkg/test" kubeutil "github.com/heptio/velero/pkg/util/kube" - velerotest "github.com/heptio/velero/pkg/util/test" ) type downloadRequestTestHarness struct { diff --git a/pkg/controller/gc_controller_test.go b/pkg/controller/gc_controller_test.go index 8c0aedd46..a25c48e97 100644 --- a/pkg/controller/gc_controller_test.go +++ b/pkg/controller/gc_controller_test.go @@ -36,8 +36,8 @@ import ( "github.com/heptio/velero/pkg/builder" "github.com/heptio/velero/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/velero/pkg/generated/informers/externalversions" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/kube" - velerotest "github.com/heptio/velero/pkg/util/test" ) func TestGCControllerEnqueueAllBackups(t *testing.T) { diff --git a/pkg/controller/pod_volume_backup_controller_test.go b/pkg/controller/pod_volume_backup_controller_test.go index e051aa751..9d17ae647 100644 --- a/pkg/controller/pod_volume_backup_controller_test.go +++ b/pkg/controller/pod_volume_backup_controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestPVBHandler(t *testing.T) { diff --git a/pkg/controller/pod_volume_restore_controller_test.go b/pkg/controller/pod_volume_restore_controller_test.go index 01e08f989..e50ee0e94 100644 --- a/pkg/controller/pod_volume_restore_controller_test.go +++ b/pkg/controller/pod_volume_restore_controller_test.go @@ -34,7 +34,7 @@ import ( veleroinformers "github.com/heptio/velero/pkg/generated/informers/externalversions" velerov1listers "github.com/heptio/velero/pkg/generated/listers/velero/v1" "github.com/heptio/velero/pkg/restic" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestPVRHandler(t *testing.T) { diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index e0b9d5232..af10f0a42 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -46,8 +46,8 @@ import ( pluginmocks "github.com/heptio/velero/pkg/plugin/mocks" "github.com/heptio/velero/pkg/plugin/velero" pkgrestore "github.com/heptio/velero/pkg/restore" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/logging" - velerotest "github.com/heptio/velero/pkg/util/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/controller/schedule_controller_test.go b/pkg/controller/schedule_controller_test.go index 9fc33de88..0930a7ef2 100644 --- a/pkg/controller/schedule_controller_test.go +++ b/pkg/controller/schedule_controller_test.go @@ -36,7 +36,7 @@ import ( "github.com/heptio/velero/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/velero/pkg/generated/informers/externalversions" "github.com/heptio/velero/pkg/metrics" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestProcessSchedule(t *testing.T) { diff --git a/pkg/discovery/helper_test.go b/pkg/discovery/helper_test.go index bc9e184e1..accbbffda 100644 --- a/pkg/discovery/helper_test.go +++ b/pkg/discovery/helper_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/logging" - velerotest "github.com/heptio/velero/pkg/util/test" ) func TestSortResources(t *testing.T) { diff --git a/pkg/persistence/object_store_test.go b/pkg/persistence/object_store_test.go index e04d51bca..578ccc0c8 100644 --- a/pkg/persistence/object_store_test.go +++ b/pkg/persistence/object_store_test.go @@ -39,8 +39,8 @@ import ( "github.com/heptio/velero/pkg/cloudprovider" cloudprovidermocks "github.com/heptio/velero/pkg/cloudprovider/mocks" "github.com/heptio/velero/pkg/plugin/velero" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/encode" - velerotest "github.com/heptio/velero/pkg/util/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/plugin/clientmgmt/client_builder_test.go b/pkg/plugin/clientmgmt/client_builder_test.go index 6b00bd83e..c5292b6d5 100644 --- a/pkg/plugin/clientmgmt/client_builder_test.go +++ b/pkg/plugin/clientmgmt/client_builder_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/heptio/velero/pkg/plugin/framework" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) func TestNewClientBuilder(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/manager_test.go b/pkg/plugin/clientmgmt/manager_test.go index cf0c12439..97f436424 100644 --- a/pkg/plugin/clientmgmt/manager_test.go +++ b/pkg/plugin/clientmgmt/manager_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" "github.com/heptio/velero/pkg/plugin/framework" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) type mockRegistry struct { diff --git a/pkg/plugin/clientmgmt/registry_test.go b/pkg/plugin/clientmgmt/registry_test.go index 38804b913..87fbbd513 100644 --- a/pkg/plugin/clientmgmt/registry_test.go +++ b/pkg/plugin/clientmgmt/registry_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) func TestNewRegistry(t *testing.T) { diff --git a/pkg/plugin/framework/backup_item_action_test.go b/pkg/plugin/framework/backup_item_action_test.go index 8253ac0f6..aff3b7049 100644 --- a/pkg/plugin/framework/backup_item_action_test.go +++ b/pkg/plugin/framework/backup_item_action_test.go @@ -32,7 +32,7 @@ import ( "github.com/heptio/velero/pkg/backup/mocks" proto "github.com/heptio/velero/pkg/plugin/generated" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestBackupItemActionGRPCServerExecute(t *testing.T) { diff --git a/pkg/plugin/framework/client_dispenser_test.go b/pkg/plugin/framework/client_dispenser_test.go index c68de3285..81baa2736 100644 --- a/pkg/plugin/framework/client_dispenser_test.go +++ b/pkg/plugin/framework/client_dispenser_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) type fakeClient struct { diff --git a/pkg/plugin/framework/plugin_base_test.go b/pkg/plugin/framework/plugin_base_test.go index 016e04f15..64724bae3 100644 --- a/pkg/plugin/framework/plugin_base_test.go +++ b/pkg/plugin/framework/plugin_base_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) func TestClientLogger(t *testing.T) { diff --git a/pkg/podexec/pod_command_executor_test.go b/pkg/podexec/pod_command_executor_test.go index ea8442b48..68f372b1c 100644 --- a/pkg/podexec/pod_command_executor_test.go +++ b/pkg/podexec/pod_command_executor_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/tools/remotecommand" v1 "github.com/heptio/velero/pkg/apis/velero/v1" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestNewPodCommandExecutor(t *testing.T) { diff --git a/pkg/restic/common_test.go b/pkg/restic/common_test.go index f6cf9c037..f5410560c 100644 --- a/pkg/restic/common_test.go +++ b/pkg/restic/common_test.go @@ -30,7 +30,7 @@ import ( velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" "github.com/heptio/velero/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/velero/pkg/generated/informers/externalversions" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestGetPodSnapshotAnnotations(t *testing.T) { diff --git a/pkg/restore/add_pv_from_pvc_action_test.go b/pkg/restore/add_pv_from_pvc_action_test.go index d9fcbd5e3..bb86860b4 100644 --- a/pkg/restore/add_pv_from_pvc_action_test.go +++ b/pkg/restore/add_pv_from_pvc_action_test.go @@ -27,7 +27,7 @@ import ( "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestAddPVFromPVCActionExecute(t *testing.T) { diff --git a/pkg/restore/add_pvc_from_pod_action_test.go b/pkg/restore/add_pvc_from_pod_action_test.go index 11e574dd9..df2cdf46f 100644 --- a/pkg/restore/add_pvc_from_pod_action_test.go +++ b/pkg/restore/add_pvc_from_pod_action_test.go @@ -28,7 +28,7 @@ import ( "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestAddPVCFromPodActionExecute(t *testing.T) { diff --git a/pkg/restore/job_action_test.go b/pkg/restore/job_action_test.go index 360a9d77b..12fa1131e 100644 --- a/pkg/restore/job_action_test.go +++ b/pkg/restore/job_action_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestJobActionExecute(t *testing.T) { diff --git a/pkg/restore/merge_service_account_test.go b/pkg/restore/merge_service_account_test.go index 5783cdbae..5b306ad77 100644 --- a/pkg/restore/merge_service_account_test.go +++ b/pkg/restore/merge_service_account_test.go @@ -25,7 +25,7 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) var mergedServiceAccountsBenchmarkResult *unstructured.Unstructured diff --git a/pkg/restore/pod_action_test.go b/pkg/restore/pod_action_test.go index 5590e9f20..7789db521 100644 --- a/pkg/restore/pod_action_test.go +++ b/pkg/restore/pod_action_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestPodActionExecute(t *testing.T) { diff --git a/pkg/restore/pv_restorer_test.go b/pkg/restore/pv_restorer_test.go index d3b92658c..2f218ba15 100644 --- a/pkg/restore/pv_restorer_test.go +++ b/pkg/restore/pv_restorer_test.go @@ -31,7 +31,7 @@ import ( "github.com/heptio/velero/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/velero/pkg/generated/informers/externalversions" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/restore/restic_restore_action_test.go b/pkg/restore/restic_restore_action_test.go index bf89c55f7..c801f4053 100644 --- a/pkg/restore/restic_restore_action_test.go +++ b/pkg/restore/restic_restore_action_test.go @@ -33,8 +33,8 @@ import ( "github.com/heptio/velero/pkg/buildinfo" velerofake "github.com/heptio/velero/pkg/generated/clientset/versioned/fake" "github.com/heptio/velero/pkg/plugin/velero" + velerotest "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/kube" - velerotest "github.com/heptio/velero/pkg/util/test" ) func TestGetImage(t *testing.T) { diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index d4e62c2e6..cbf1e1237 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -51,10 +51,10 @@ import ( "github.com/heptio/velero/pkg/kuberesource" "github.com/heptio/velero/pkg/plugin/velero" "github.com/heptio/velero/pkg/test" + testutil "github.com/heptio/velero/pkg/test" "github.com/heptio/velero/pkg/util/collections" "github.com/heptio/velero/pkg/util/encode" kubeutil "github.com/heptio/velero/pkg/util/kube" - testutil "github.com/heptio/velero/pkg/util/test" "github.com/heptio/velero/pkg/volume" ) diff --git a/pkg/restore/service_account_action_test.go b/pkg/restore/service_account_action_test.go index e63230b85..83e04841f 100644 --- a/pkg/restore/service_account_action_test.go +++ b/pkg/restore/service_account_action_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/heptio/velero/pkg/plugin/velero" - "github.com/heptio/velero/pkg/util/test" + "github.com/heptio/velero/pkg/test" ) func TestServiceAccountActionAppliesTo(t *testing.T) { diff --git a/pkg/restore/service_action_test.go b/pkg/restore/service_action_test.go index d4f338c13..ee8c8e130 100644 --- a/pkg/restore/service_action_test.go +++ b/pkg/restore/service_action_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/heptio/velero/pkg/plugin/velero" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func svcJSON(ports ...corev1api.ServicePort) string { diff --git a/pkg/util/test/comparisons.go b/pkg/test/comparisons.go similarity index 100% rename from pkg/util/test/comparisons.go rename to pkg/test/comparisons.go diff --git a/pkg/util/test/fake_discovery_helper.go b/pkg/test/fake_discovery_helper.go similarity index 100% rename from pkg/util/test/fake_discovery_helper.go rename to pkg/test/fake_discovery_helper.go diff --git a/pkg/util/test/fake_dynamic.go b/pkg/test/fake_dynamic.go similarity index 100% rename from pkg/util/test/fake_dynamic.go rename to pkg/test/fake_dynamic.go diff --git a/pkg/util/test/fake_file_system.go b/pkg/test/fake_file_system.go similarity index 100% rename from pkg/util/test/fake_file_system.go rename to pkg/test/fake_file_system.go diff --git a/pkg/util/test/fake_mapper.go b/pkg/test/fake_mapper.go similarity index 100% rename from pkg/util/test/fake_mapper.go rename to pkg/test/fake_mapper.go diff --git a/pkg/util/test/fake_namespace.go b/pkg/test/fake_namespace.go similarity index 100% rename from pkg/util/test/fake_namespace.go rename to pkg/test/fake_namespace.go diff --git a/pkg/util/test/fake_volume_snapshotter.go b/pkg/test/fake_volume_snapshotter.go similarity index 100% rename from pkg/util/test/fake_volume_snapshotter.go rename to pkg/test/fake_volume_snapshotter.go diff --git a/pkg/util/test/helpers.go b/pkg/test/helpers.go similarity index 100% rename from pkg/util/test/helpers.go rename to pkg/test/helpers.go diff --git a/pkg/util/test/mock_pod_command_executor.go b/pkg/test/mock_pod_command_executor.go similarity index 100% rename from pkg/util/test/mock_pod_command_executor.go rename to pkg/test/mock_pod_command_executor.go diff --git a/pkg/util/test/test_logger.go b/pkg/test/test_logger.go similarity index 100% rename from pkg/util/test/test_logger.go rename to pkg/test/test_logger.go diff --git a/pkg/util/kube/utils_test.go b/pkg/util/kube/utils_test.go index 6eab3e588..1554f33aa 100644 --- a/pkg/util/kube/utils_test.go +++ b/pkg/util/kube/utils_test.go @@ -31,7 +31,7 @@ import ( "github.com/heptio/velero/pkg/builder" "github.com/heptio/velero/pkg/test" - velerotest "github.com/heptio/velero/pkg/util/test" + velerotest "github.com/heptio/velero/pkg/test" ) func TestNamespaceAndName(t *testing.T) {