From fa2a6d633984aaa36ef988ecf4410c20e27897ea Mon Sep 17 00:00:00 2001 From: Steve Kuznetsov Date: Wed, 11 May 2022 09:05:18 -0700 Subject: [PATCH] storage: isolate the test resource This test resource only exists to test the versioning logic, but it cannot live in the general testing package, or import cycles will exist. Signed-off-by: Steve Kuznetsov --- .../pkg/storage/api_object_versioner_test.go | 12 ++++++------ .../pkg/storage/{testing => testresource}/doc.go | 2 +- .../pkg/storage/{testing => testresource}/types.go | 2 +- .../zz_generated.deepcopy.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename staging/src/k8s.io/apiserver/pkg/storage/{testing => testresource}/doc.go (88%) rename staging/src/k8s.io/apiserver/pkg/storage/{testing => testresource}/types.go (97%) rename staging/src/k8s.io/apiserver/pkg/storage/{testing => testresource}/zz_generated.deepcopy.go (98%) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/api_object_versioner_test.go b/staging/src/k8s.io/apiserver/pkg/storage/api_object_versioner_test.go index a3586aed67b..808512c68f6 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/api_object_versioner_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/api_object_versioner_test.go @@ -20,18 +20,18 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - storagetesting "k8s.io/apiserver/pkg/storage/testing" + "k8s.io/apiserver/pkg/storage/testresource" ) func TestObjectVersioner(t *testing.T) { v := APIObjectVersioner{} - if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 { + if ver, err := v.ObjectResourceVersion(&testresource.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 { t.Errorf("unexpected version: %d %v", ver, err) } - if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 { + if ver, err := v.ObjectResourceVersion(&testresource.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 { t.Errorf("unexpected version: %d %v", ver, err) } - obj := &storagetesting.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "a"}} + obj := &testresource.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "a"}} if err := v.UpdateObject(obj, 5); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -77,8 +77,8 @@ func TestEtcdParseResourceVersion(t *testing.T) { } func TestCompareResourceVersion(t *testing.T) { - five := &storagetesting.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "5"}} - six := &storagetesting.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "6"}} + five := &testresource.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "5"}} + six := &testresource.TestResource{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "6"}} versioner := APIObjectVersioner{} diff --git a/staging/src/k8s.io/apiserver/pkg/storage/testing/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go similarity index 88% rename from staging/src/k8s.io/apiserver/pkg/storage/testing/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go index aa5468d4c34..de1aa04be66 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/testing/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package -package testing // import "k8s.io/apiserver/pkg/storage/testing" +package testresource // import "k8s.io/apiserver/pkg/storage/testresource" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/testing/types.go b/staging/src/k8s.io/apiserver/pkg/storage/testresource/types.go similarity index 97% rename from staging/src/k8s.io/apiserver/pkg/storage/testing/types.go rename to staging/src/k8s.io/apiserver/pkg/storage/testresource/types.go index 37a70cbf5f7..a2db6959b24 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/testing/types.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/testresource/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package testing +package testresource import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/testing/zz_generated.deepcopy.go b/staging/src/k8s.io/apiserver/pkg/storage/testresource/zz_generated.deepcopy.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/storage/testing/zz_generated.deepcopy.go rename to staging/src/k8s.io/apiserver/pkg/storage/testresource/zz_generated.deepcopy.go index 8b368c57cba..77478498485 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/testing/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/testresource/zz_generated.deepcopy.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by deepcopy-gen. DO NOT EDIT. -package testing +package testresource import ( runtime "k8s.io/apimachinery/pkg/runtime"