Merge pull request #172 from niladrih/testwill-pkg-import

chore: import packages only once
openebs-archive · Dec 6, 2023 · 2b0be4c · 2b0be4c
2 parents ec6a0f9 + 68ad757
commit 2b0be4c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/buildscripts/check-diff.sh b/buildscripts/check-diff.sh
@@ -21,6 +21,6 @@ set -e
 TEST_NAME=$1
 
 
-if [[ `git diff --shortstat | wc -l` != 0 ]]; then 
+if [[ `git diff --shortstat | wc -l | tr -d ' '` != 0 ]]; then 
   echo "Some files got changed after $1";printf "\n";git --no-pager diff;printf "\n"; exit 1;
 fi
diff --git a/pkg/kubernetes/api/core/v1/persistentvolume/kubernetes_test.go b/pkg/kubernetes/api/core/v1/persistentvolume/kubernetes_test.go
@@ -19,7 +19,6 @@ import (
 
 	errors "github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -425,23 +424,23 @@ func TestKubernetesPVCreate(t *testing.T) {
 		getClientSetForPath getClientsetForPathFn
 		kubeConfigPath      string
 		create              createFn
-		pv                  *v1.PersistentVolume
+		pv                  *corev1.PersistentVolume
 		expectErr           bool
 	}{
 		"Test 1": {
 			getClientSet:        fakeGetClientSetErr,
 			getClientSetForPath: fakeGetClientSetForPathErr,
 			kubeConfigPath:      "",
 			create:              fakeCreateFnOk,
-			pv:                  &v1.PersistentVolume{ObjectMeta: metav1.ObjectMeta{Name: "PV-1"}},
+			pv:                  &corev1.PersistentVolume{ObjectMeta: metav1.ObjectMeta{Name: "PV-1"}},
 			expectErr:           true,
 		},
 		"Test 2": {
 			getClientSet:        fakeGetClientSetOk,
 			getClientSetForPath: fakeGetClientSetForPathOk,
 			kubeConfigPath:      "",
 			create:              fakeCreateFnErr,
-			pv:                  &v1.PersistentVolume{ObjectMeta: metav1.ObjectMeta{Name: "PV-2"}},
+			pv:                  &corev1.PersistentVolume{ObjectMeta: metav1.ObjectMeta{Name: "PV-2"}},
 			expectErr:           true,
 		},
 		"Test 3": {

diff --git a/pkg/kubernetes/api/core/v1/persistentvolumeclaim/kubernetes_test.go b/pkg/kubernetes/api/core/v1/persistentvolumeclaim/kubernetes_test.go
@@ -19,7 +19,6 @@ import (
 
 	errors "github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -447,23 +446,23 @@ func TestKubernetesPVCCreate(t *testing.T) {
 		getClientSetForPath getClientsetForPathFn
 		kubeConfigPath      string
 		create              createFn
-		pvc                 *v1.PersistentVolumeClaim
+		pvc                 *corev1.PersistentVolumeClaim
 		expectErr           bool
 	}{
 		"Test 1": {
 			getClientSet:        fakeGetClientSetErr,
 			getClientSetForPath: fakeGetClientSetForPathErr,
 			kubeConfigPath:      "",
 			create:              fakeCreateFnOk,
-			pvc:                 &v1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "PVC-1"}},
+			pvc:                 &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "PVC-1"}},
 			expectErr:           true,
 		},
 		"Test 2": {
 			getClientSet:        fakeGetClientSetOk,
 			getClientSetForPath: fakeGetClientSetForPathOk,
 			kubeConfigPath:      "",
 			create:              fakeCreateFnErr,
-			pvc:                 &v1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "PVC-2"}},
+			pvc:                 &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "PVC-2"}},
 			expectErr:           true,
 		},
 		"Test 3": {
@@ -516,21 +515,21 @@ func TestKubernetesPVCCreateCollection(t *testing.T) {
 	tests := map[string]struct {
 		getClientSet getClientsetFn
 		create       createFn
-		pvc          *v1.PersistentVolumeClaim
+		pvc          *corev1.PersistentVolumeClaim
 		expectErr    bool
 	}{
 		"Test 1": {
 			getClientSet: fakeGetClientSetErr,
 			create:       fakeCreateFnOk,
-			pvc: &v1.PersistentVolumeClaim{
+			pvc: &corev1.PersistentVolumeClaim{
 				ObjectMeta: metav1.ObjectMeta{GenerateName: "PVC-1"},
 			},
 			expectErr: true,
 		},
 		"Test 2": {
 			getClientSet: fakeGetClientSetOk,
 			create:       fakeCreateFnErr,
-			pvc: &v1.PersistentVolumeClaim{
+			pvc: &corev1.PersistentVolumeClaim{
 				ObjectMeta: metav1.ObjectMeta{GenerateName: "PVC-2"},
 			},
 			expectErr: true,
@@ -544,7 +543,7 @@ func TestKubernetesPVCCreateCollection(t *testing.T) {
 		"Test 4": {
 			getClientSet: fakeGetClientSetOk,
 			create:       fakeCreateFnOk,
-			pvc: &v1.PersistentVolumeClaim{
+			pvc: &corev1.PersistentVolumeClaim{
 				ObjectMeta: metav1.ObjectMeta{GenerateName: "PVC-4"},
 			},
 			expectErr: false,