Skip to content

Commit 0915a50

Browse files
XudongLiuHaroldXudongLiuHarold
committed
remove unused wrapper
Signed-off-by: Xudong Liu <[email protected]>
1 parent 74bde04 commit 0915a50

File tree

6 files changed

+25
-249
lines changed

6 files changed

+25
-249
lines changed

‎pkg/cloudprovider/vsphereparavirtual/instances_test.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/runtime"
2929
"k8s.io/apimachinery/pkg/types"
30+
"k8s.io/client-go/rest"
3031
clientgotesting "k8s.io/client-go/testing"
3132
cloudprovider "k8s.io/cloud-provider"
3233
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
33-
"sigs.k8s.io/controller-runtime/pkg/envtest"
3434
)
3535

3636
var (
@@ -68,29 +68,21 @@ func createTestVMWithVMIPAndHost(name, namespace, biosUUID string) *vmopv1alpha1
6868
func TestNewInstances(t *testing.T) {
6969
testCases := []struct {
7070
name string
71-
testEnv *envtest.Environment
71+
config *rest.Config
7272
expectedErr error
7373
}{
7474
{
75-
name: "NewInstance: when everything is ok",
76-
// The above code is declaring a test environment variable of type `envtest.Environment` and
77-
// initializing it with an empty instance of `envtest.Environment`.
78-
testEnv: &envtest.Environment{},
75+
name: "NewInstance: when everything is ok",
76+
config: &rest.Config{},
7977
expectedErr: nil,
8078
},
8179
}
8280

8381
for _, testCase := range testCases {
8482
t.Run(testCase.name, func(t *testing.T) {
85-
cfg, err := testCase.testEnv.Start()
86-
assert.NoError(t, err)
87-
88-
_, err = NewInstances(testClusterNameSpace, cfg)
83+
_, err := NewInstances(testClusterNameSpace, testCase.config)
8984
assert.NoError(t, err)
9085
assert.Equal(t, testCase.expectedErr, err)
91-
92-
err = testCase.testEnv.Stop()
93-
assert.NoError(t, err)
9486
})
9587
}
9688
}

‎pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/runtime"
30+
"k8s.io/client-go/rest"
3031
clientgotesting "k8s.io/client-go/testing"
3132
cloudprovider "k8s.io/cloud-provider"
3233
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
33-
"sigs.k8s.io/controller-runtime/pkg/envtest"
3434

3535
"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmservice"
3636

@@ -61,27 +61,21 @@ func newTestLoadBalancer() (cloudprovider.LoadBalancer, *fakevmclient.Clientset)
6161

6262
func TestNewLoadBalancer(t *testing.T) {
6363
testCases := []struct {
64-
name string
65-
testEnv *envtest.Environment
66-
err error
64+
name string
65+
config *rest.Config
66+
err error
6767
}{
6868
{
69-
name: "NewLoadBalancer: when everything is ok",
70-
testEnv: &envtest.Environment{},
71-
err: nil,
69+
name: "NewLoadBalancer: when everything is ok",
70+
config: &rest.Config{},
71+
err: nil,
7272
},
7373
}
7474

7575
for _, testCase := range testCases {
7676
t.Run(testCase.name, func(t *testing.T) {
77-
cfg, err := testCase.testEnv.Start()
78-
assert.NoError(t, err)
79-
80-
_, err = NewLoadBalancer(testClusterNameSpace, cfg, &testOwnerReference)
77+
_, err := NewLoadBalancer(testClusterNameSpace, testCase.config, &testOwnerReference)
8178
assert.Equal(t, testCase.err, err)
82-
83-
err = testCase.testEnv.Stop()
84-
assert.NoError(t, err)
8579
})
8680
}
8781
}

‎pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
apierrors "k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
runtime "k8s.io/apimachinery/pkg/runtime"
33+
rest "k8s.io/client-go/rest"
3334
clientgotesting "k8s.io/client-go/testing"
3435

3536
"k8s.io/apimachinery/pkg/util/intstr"
3637
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
37-
"sigs.k8s.io/controller-runtime/pkg/envtest"
3838
)
3939

4040
var (
@@ -50,9 +50,6 @@ var (
5050
}
5151
vms VMService
5252
fakeLBIP = "1.1.1.1"
53-
54-
// FakeClientWrapper allows functions to be replaced for fault injection
55-
fc *fakevmclient.Clientset
5653
)
5754

5855
func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) {
@@ -84,31 +81,25 @@ func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) {
8481

8582
func TestNewVMService(t *testing.T) {
8683
testCases := []struct {
87-
name string
88-
testEnv *envtest.Environment
89-
err error
84+
name string
85+
config *rest.Config
86+
err error
9087
}{
9188
{
92-
name: "NewVMService: when everything is ok",
93-
testEnv: &envtest.Environment{},
94-
err: nil,
89+
name: "NewVMService: when everything is ok",
90+
config: &rest.Config{},
91+
err: nil,
9592
},
9693
}
9794

9895
for _, testCase := range testCases {
9996
t.Run(testCase.name, func(t *testing.T) {
100-
cfg, err := testCase.testEnv.Start()
101-
assert.NoError(t, err)
102-
103-
client, err := GetVmopClient(cfg)
97+
client, err := GetVmopClient(testCase.config)
10498
assert.NoError(t, err)
10599
assert.NotEqual(t, client, nil)
106100

107101
realVms := NewVMService(client, testClusterNameSpace, &testOwnerReference)
108102
assert.NotEqual(t, realVms, nil)
109-
110-
err = testCase.testEnv.Stop()
111-
assert.NoError(t, err)
112103
})
113104
}
114105
}

‎pkg/cloudprovider/vsphereparavirtual/zone_test.go

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
vmopv1alpha1 "github.com/vmware-tanzu/vm-operator-api/api/v1alpha1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/types"
11+
"k8s.io/client-go/rest"
1112
cloudprovider "k8s.io/cloud-provider"
1213
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
13-
"sigs.k8s.io/controller-runtime/pkg/envtest"
1414
)
1515

1616
var (
@@ -23,37 +23,31 @@ var (
2323
func TestNewZones(t *testing.T) {
2424
testCases := []struct {
2525
name string
26-
testEnv *envtest.Environment
26+
config *rest.Config
2727
expectedErr error
2828
testVM *vmopv1alpha1.VirtualMachine
2929
}{
3030
{
3131
name: "NewZone: when everything is ok",
32-
testEnv: &envtest.Environment{},
32+
config: &rest.Config{},
3333
testVM: createTestVMWithZone(string(vmName), testClusterNameSpace),
3434
expectedErr: nil,
3535
},
3636
}
3737

3838
for _, testCase := range testCases {
3939
t.Run(testCase.name, func(t *testing.T) {
40-
cfg, err := testCase.testEnv.Start()
41-
assert.NoError(t, err)
4240
//initVMopClient(testCase.testVM)
43-
_, err = NewZones(testClusterNameSpace, cfg)
41+
_, err := NewZones(testClusterNameSpace, testCase.config)
4442
assert.NoError(t, err)
4543
assert.Equal(t, testCase.expectedErr, err)
46-
47-
err = testCase.testEnv.Stop()
48-
assert.NoError(t, err)
4944
})
5045
}
5146
}
5247

5348
func TestZonesByProviderID(t *testing.T) {
5449
testCases := []struct {
5550
name string
56-
testEnv *envtest.Environment
5751
expectedResult string
5852
expectedErr error
5953
testVM *vmopv1alpha1.VirtualMachine
@@ -94,7 +88,6 @@ func TestZonesByProviderID(t *testing.T) {
9488
func TestZonesByNodeName(t *testing.T) {
9589
testCases := []struct {
9690
name string
97-
testEnv *envtest.Environment
9891
expectedResult string
9992
expectedErr error
10093
testVM *vmopv1alpha1.VirtualMachine

‎pkg/util/fake_vm_client_wrapper.go

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)