Skip to content

Commit 9e9985d

Browse files
authored
🌱 use testing.Setenv instead of os.Setenv (#10919)
* use testing.Setenv instead of os.Setenv Signed-off-by: sivchari <[email protected]> * fix: build failed error Signed-off-by: sivchari <[email protected]> --------- Signed-off-by: sivchari <[email protected]>
1 parent 2be3eea commit 9e9985d

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

cmd/clusterctl/client/config/cert_manager_client_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package config
1818

1919
import (
20-
"os"
2120
"testing"
2221

2322
. "github.com/onsi/gomega"
@@ -77,13 +76,8 @@ func TestCertManagerGet(t *testing.T) {
7776
g := NewWithT(t)
7877

7978
for k, v := range tt.envVars {
80-
g.Expect(os.Setenv(k, v)).To(Succeed())
79+
t.Setenv(k, v)
8180
}
82-
defer func() {
83-
for k := range tt.envVars {
84-
g.Expect(os.Unsetenv(k)).To(Succeed())
85-
}
86-
}()
8781
p := &certManagerClient{
8882
reader: tt.fields.reader,
8983
}

cmd/clusterctl/client/config/providers_client_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package config
1818

1919
import (
2020
"fmt"
21-
"os"
2221
"sort"
2322
"testing"
2423

@@ -148,13 +147,8 @@ func Test_providers_List(t *testing.T) {
148147
g := NewWithT(t)
149148

150149
for k, v := range tt.envVars {
151-
g.Expect(os.Setenv(k, v)).To(Succeed())
150+
t.Setenv(k, v)
152151
}
153-
defer func() {
154-
for k := range tt.envVars {
155-
g.Expect(os.Unsetenv(k)).To(Succeed())
156-
}
157-
}()
158152
p := &providersClient{
159153
reader: tt.fields.configGetter,
160154
}

cmd/clusterctl/client/repository/overrides_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package repository
1818

1919
import (
20-
"os"
2120
"path/filepath"
2221
"testing"
2322

@@ -74,13 +73,8 @@ func TestOverrides(t *testing.T) {
7473
g := NewWithT(t)
7574

7675
for k, v := range tt.envVars {
77-
g.Expect(os.Setenv(k, v)).To(Succeed())
76+
t.Setenv(k, v)
7877
}
79-
defer func() {
80-
for k := range tt.envVars {
81-
g.Expect(os.Unsetenv(k)).To(Succeed())
82-
}
83-
}()
8478
provider := config.NewProvider("myinfra", "", clusterctlv1.InfrastructureProviderType)
8579
override := newOverride(&newOverrideInput{
8680
configVariablesClient: tt.configVarClient,

0 commit comments

Comments
 (0)