@@ -21,6 +21,7 @@ import (
21
21
"testing"
22
22
23
23
"github.com/spf13/cobra"
24
+ "github.com/spf13/viper"
24
25
"k8s.io/minikube/pkg/minikube/constants"
25
26
)
26
27
@@ -49,11 +50,13 @@ func Test_extractVMDriverVersion(t *testing.T) {
49
50
}
50
51
51
52
func TestGenerateCfgFromFlagsHTTPProxyHandling (t * testing.T ) {
53
+ viper .SetDefault (memory , constants .DefaultMemorySize )
54
+ viper .SetDefault (humanReadableDiskSize , constants .DefaultDiskSize )
52
55
originalEnv := os .Getenv ("HTTP_PROXY" )
53
56
defer func () {
54
57
err := os .Setenv ("HTTP_PROXY" , originalEnv )
55
58
if err != nil {
56
- t .Fatalf ("Error reverting env HTTP_PROXY to it's original value. Got err (%s) " , err )
59
+ t .Fatalf ("Error reverting env HTTP_PROXY to it's original value. Got err: %s " , err )
57
60
}
58
61
}()
59
62
k8sVersion := constants .NewestKubernetesVersion
@@ -62,9 +65,7 @@ func TestGenerateCfgFromFlagsHTTPProxyHandling(t *testing.T) {
62
65
proxy string
63
66
proxyIgnored bool
64
67
}{
65
- {
66
- description : "no http_proxy" ,
67
- },
68
+
68
69
{
69
70
description : "http_proxy=127.0.0.1:3128" ,
70
71
proxy : "127.0.0.1:3128" ,
@@ -79,14 +80,17 @@ func TestGenerateCfgFromFlagsHTTPProxyHandling(t *testing.T) {
79
80
description : "http_proxy=1.2.3.4:3128" ,
80
81
proxy : "1.2.3.4:3128" ,
81
82
},
83
+ {
84
+ description : "no http_proxy" ,
85
+ },
82
86
}
83
87
for _ , test := range tests {
84
88
t .Run (test .description , func (t * testing.T ) {
85
- cmd := cobra.Command {}
89
+ cmd := & cobra.Command {}
86
90
if err := os .Setenv ("HTTP_PROXY" , test .proxy ); err != nil {
87
91
t .Fatalf ("Unexpected error setting HTTP_PROXY: %v" , err )
88
92
}
89
- config , err := generateCfgFromFlags (& cmd , k8sVersion )
93
+ config , err := generateCfgFromFlags (cmd , k8sVersion )
90
94
if err != nil {
91
95
t .Fatalf ("Got unexpected error %v during config generation" , err )
92
96
}
0 commit comments