@@ -22,6 +22,7 @@ import (
22
22
"os"
23
23
"reflect"
24
24
"strings"
25
+ "syscall"
25
26
"testing"
26
27
27
28
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2022-07-01/network"
@@ -82,37 +83,35 @@ users:
82
83
nodeID string
83
84
userAgent string
84
85
allowEmptyCloudConfig bool
85
- expectedErrorMessage string
86
- expectError bool
86
+ expectedErr error
87
87
}{
88
88
{
89
89
desc : "[success] out of cluster, no kubeconfig, no credential file" ,
90
90
nodeID : "" ,
91
91
allowEmptyCloudConfig : true ,
92
- expectError : false ,
92
+ expectedErr : nil ,
93
93
},
94
94
{
95
95
desc : "[failure][disallowEmptyCloudConfig] out of cluster, no kubeconfig, no credential file" ,
96
96
nodeID : "" ,
97
97
allowEmptyCloudConfig : false ,
98
- expectError : true ,
99
- expectedErrorMessage : "no cloud config provided, error: open /etc/kubernetes/azure.json: no such file or directory" ,
98
+ expectedErr : syscall .ENOENT ,
100
99
},
101
100
{
102
101
desc : "[success] out of cluster & in cluster, specify a fake kubeconfig, no credential file" ,
103
102
createFakeKubeConfig : true ,
104
103
kubeconfig : fakeKubeConfig ,
105
104
nodeID : "" ,
106
105
allowEmptyCloudConfig : true ,
107
- expectError : false ,
106
+ expectedErr : nil ,
108
107
},
109
108
{
110
109
desc : "[success] out of cluster & in cluster, no kubeconfig, a fake credential file" ,
111
110
createFakeCredFile : true ,
112
111
nodeID : "" ,
113
112
userAgent : "useragent" ,
114
113
allowEmptyCloudConfig : true ,
115
- expectError : false ,
114
+ expectedErr : nil ,
116
115
},
117
116
}
118
117
@@ -159,10 +158,7 @@ users:
159
158
}
160
159
161
160
cloud , err := GetCloudProvider (context .Background (), kubeClient , test .nodeID , "" , "" , test .userAgent , test .allowEmptyCloudConfig )
162
- assert .Equal (t , test .expectError , err != nil )
163
- if test .expectError {
164
- assert .Equal (t , test .expectedErrorMessage , err .Error ())
165
- }
161
+ assert .ErrorIs (t , err , test .expectedErr )
166
162
167
163
if cloud == nil {
168
164
t .Errorf ("return value of getCloudProvider should not be nil even there is error" )
0 commit comments