Skip to content

Commit 60d3f00

Browse files
corneliusweigcorneliusweig
authored
Use go 1.14 t.Cleanup() for simpler tests (#633)
* Use go 1.14 t.Cleanup() for simpler tests * Update godoc for NewTempDir()
1 parent bf4ad3a commit 60d3f00

File tree

26 files changed

+108
-205
lines changed

26 files changed

+108
-205
lines changed

‎cmd/krew/cmd/internal/setup_check_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import (
2424
)
2525

2626
func TestIsBinDirInPATH_firstRun(t *testing.T) {
27-
tempDir, cleanup := testutil.NewTempDir(t)
28-
defer cleanup()
27+
tempDir := testutil.NewTempDir(t)
2928

3029
paths := environment.NewPaths(tempDir.Path("does-not-exist"))
3130
res := IsBinDirInPATH(paths)
@@ -35,8 +34,8 @@ func TestIsBinDirInPATH_firstRun(t *testing.T) {
3534
}
3635

3736
func TestIsBinDirInPATH_secondRun(t *testing.T) {
38-
tempDir, cleanup := testutil.NewTempDir(t)
39-
defer cleanup()
37+
tempDir := testutil.NewTempDir(t)
38+
4039
paths := environment.NewPaths(tempDir.Root())
4140
res := IsBinDirInPATH(paths)
4241
if res == true {

‎cmd/validate-krew-manifest/main_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ func TestValidateManifestFile(t *testing.T) {
8282

8383
for _, test := range tests {
8484
t.Run(test.name, func(t *testing.T) {
85-
tmp, cleanup := testutil.NewTempDir(t)
86-
defer cleanup()
85+
tmp := testutil.NewTempDir(t)
8786

8887
if test.writeManifest {
8988
content, err := yaml.Marshal(test.plugin)

‎integration_test/commandline_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import "testing"
1919
func TestUnknownCommand(t *testing.T) {
2020
skipShort(t)
2121

22-
test, cleanup := NewTest(t)
23-
defer cleanup()
22+
test := NewTest(t)
2423

2524
if _, err := test.Krew("foobar").Run(); err == nil {
2625
t.Errorf("Expected `krew foobar` to fail")

‎integration_test/help_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import (
2222
func TestKrewHelp(t *testing.T) {
2323
skipShort(t)
2424

25-
test, cleanup := NewTest(t)
26-
defer cleanup()
25+
test := NewTest(t)
2726

2827
test.Krew().RunOrFail() // no args
2928
test.Krew("help").RunOrFail()
@@ -33,8 +32,7 @@ func TestKrewHelp(t *testing.T) {
3332

3433
func TestRootHelpShowsKubectlPrefix(t *testing.T) {
3534
skipShort(t)
36-
test, cleanup := NewTest(t)
37-
defer cleanup()
35+
test := NewTest(t)
3836

3937
out := string(test.Krew("help").RunOrFailOutput())
4038

‎integration_test/index_test.go

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import (
2727
func TestKrewIndexAdd(t *testing.T) {
2828
skipShort(t)
2929

30-
test, cleanup := NewTest(t)
31-
defer cleanup()
30+
test := NewTest(t)
3231

3332
test.WithDefaultIndex()
3433
if _, err := test.Krew("index", "add").Run(); err == nil {
@@ -51,8 +50,7 @@ func TestKrewIndexAdd(t *testing.T) {
5150

5251
func TestKrewIndexAddUnsafe(t *testing.T) {
5352
skipShort(t)
54-
test, cleanup := NewTest(t)
55-
defer cleanup()
53+
test := NewTest(t)
5654
test.WithDefaultIndex()
5755

5856
cases := []string{"a/b", `a\b`, "../a", `..\a`}
@@ -71,8 +69,7 @@ func TestKrewIndexAddUnsafe(t *testing.T) {
7169
func TestKrewIndexAddShowsSecurityWarning(t *testing.T) {
7270
skipShort(t)
7371

74-
test, cleanup := NewTest(t)
75-
defer cleanup()
72+
test := NewTest(t)
7673

7774
test.WithDefaultIndex()
7875
index := environment.NewPaths(test.Root()).IndexPath(constants.DefaultIndexName)
@@ -85,8 +82,7 @@ func TestKrewIndexAddShowsSecurityWarning(t *testing.T) {
8582
func TestKrewIndexList(t *testing.T) {
8683
skipShort(t)
8784

88-
test, cleanup := NewTest(t)
89-
defer cleanup()
85+
test := NewTest(t)
9086

9187
test.WithDefaultIndex()
9288
out := test.Krew("index", "list").RunOrFailOutput()
@@ -106,8 +102,7 @@ func TestKrewIndexList(t *testing.T) {
106102
func TestKrewIndexList_NoIndexes(t *testing.T) {
107103
skipShort(t)
108104

109-
test, cleanup := NewTest(t)
110-
defer cleanup()
105+
test := NewTest(t)
111106

112107
test.WithDefaultIndex()
113108
index := environment.NewPaths(test.Root()).IndexBase()
@@ -124,8 +119,7 @@ func TestKrewIndexList_NoIndexes(t *testing.T) {
124119

125120
func TestKrewIndexRemove_nonExisting(t *testing.T) {
126121
skipShort(t)
127-
test, cleanup := NewTest(t)
128-
defer cleanup()
122+
test := NewTest(t)
129123

130124
_, err := test.Krew("index", "remove", "non-existing").Run()
131125
if err == nil {
@@ -135,18 +129,16 @@ func TestKrewIndexRemove_nonExisting(t *testing.T) {
135129

136130
func TestKrewIndexRemove_ok(t *testing.T) {
137131
skipShort(t)
138-
test, cleanup := NewTest(t)
132+
test := NewTest(t)
139133
test.WithDefaultIndex().WithCustomIndexFromDefault("foo")
140-
defer cleanup()
141134

142135
test.Krew("index", "remove", "foo").RunOrFail()
143136
}
144137

145138
func TestKrewIndexRemove_unsafe(t *testing.T) {
146139
skipShort(t)
147-
test, cleanup := NewTest(t)
140+
test := NewTest(t)
148141
test.WithDefaultIndex()
149-
defer cleanup()
150142

151143
expected := "invalid index name"
152144
cases := []string{"a/b", `a\b`, "../a", `..\a`}
@@ -162,9 +154,8 @@ func TestKrewIndexRemove_unsafe(t *testing.T) {
162154

163155
func TestKrewIndexRemoveFailsWhenPluginsInstalled(t *testing.T) {
164156
skipShort(t)
165-
test, cleanup := NewTest(t)
157+
test := NewTest(t)
166158
test.WithDefaultIndex()
167-
defer cleanup()
168159

169160
test.Krew("install", validPlugin).RunOrFailOutput()
170161
if _, err := test.Krew("index", "remove", "default").Run(); err == nil {
@@ -177,17 +168,15 @@ func TestKrewIndexRemoveFailsWhenPluginsInstalled(t *testing.T) {
177168

178169
func TestKrewIndexRemoveForce_nonExisting(t *testing.T) {
179170
skipShort(t)
180-
test, cleanup := NewTest(t)
181-
defer cleanup()
171+
test := NewTest(t)
182172

183173
// --force returns success for non-existing indexes
184174
test.Krew("index", "remove", "--force", "non-existing").RunOrFail()
185175
}
186176

187177
func TestKrewDefaultIndex_notAutomaticallyAdded(t *testing.T) {
188178
skipShort(t)
189-
test, cleanup := NewTest(t)
190-
defer cleanup()
179+
test := NewTest(t)
191180

192181
test.Krew("help").RunOrFail()
193182
out, err := test.Krew("search").Run()
@@ -202,26 +191,23 @@ func TestKrewDefaultIndex_notAutomaticallyAdded(t *testing.T) {
202191

203192
func TestKrewDefaultIndex_AutoAddedOnInstall(t *testing.T) {
204193
skipShort(t)
205-
test, cleanup := NewTest(t)
206-
defer cleanup()
194+
test := NewTest(t)
207195

208196
test.Krew("install", validPlugin).RunOrFail()
209197
ensureIndexListHasDefaultIndex(t, string(test.Krew("index", "list").RunOrFailOutput()))
210198
}
211199

212200
func TestKrewDefaultIndex_AutoAddedOnUpdate(t *testing.T) {
213201
skipShort(t)
214-
test, cleanup := NewTest(t)
215-
defer cleanup()
202+
test := NewTest(t)
216203

217204
test.Krew("update").RunOrFail()
218205
ensureIndexListHasDefaultIndex(t, string(test.Krew("index", "list").RunOrFailOutput()))
219206
}
220207

221208
func TestKrewDefaultIndex_AutoAddedOnUpgrade(t *testing.T) {
222209
skipShort(t)
223-
test, cleanup := NewTest(t)
224-
defer cleanup()
210+
test := NewTest(t)
225211

226212
test.Krew("upgrade").RunOrFail()
227213
ensureIndexListHasDefaultIndex(t, string(test.Krew("index", "list").RunOrFailOutput()))

‎integration_test/info_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import (
2222
func TestKrewInfo(t *testing.T) {
2323
skipShort(t)
2424

25-
test, cleanup := NewTest(t)
26-
defer cleanup()
25+
test := NewTest(t)
2726

2827
out := string(test.WithDefaultIndex().Krew("info", validPlugin).RunOrFailOutput())
2928
expected := `INDEX: default`
@@ -35,8 +34,7 @@ func TestKrewInfo(t *testing.T) {
3534
func TestKrewInfoInvalidPlugin(t *testing.T) {
3635
skipShort(t)
3736

38-
test, cleanup := NewTest(t)
39-
defer cleanup()
37+
test := NewTest(t)
4038

4139
plugin := "invalid-plugin"
4240
_, err := test.WithDefaultIndex().Krew("info", plugin).Run()
@@ -48,8 +46,7 @@ func TestKrewInfoInvalidPlugin(t *testing.T) {
4846
func TestKrewInfoCustomIndex(t *testing.T) {
4947
skipShort(t)
5048

51-
test, cleanup := NewTest(t)
52-
defer cleanup()
49+
test := NewTest(t)
5350

5451
test = test.WithDefaultIndex().WithCustomIndexFromDefault("foo")
5552
test.Krew("install", "foo/"+validPlugin).RunOrFail()

‎integration_test/install_test.go

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ const (
3030

3131
func TestKrewInstall(t *testing.T) {
3232
skipShort(t)
33-
test, cleanup := NewTest(t)
34-
defer cleanup()
33+
test := NewTest(t)
3534

3635
if err := test.Krew("install", validPlugin); err == nil {
3736
t.Fatal("expected to fail without initializing the index")
@@ -49,8 +48,7 @@ func TestKrewInstall(t *testing.T) {
4948

5049
func TestKrewInstallReRun(t *testing.T) {
5150
skipShort(t)
52-
test, cleanup := NewTest(t)
53-
defer cleanup()
51+
test := NewTest(t)
5452

5553
test = test.WithDefaultIndex()
5654
test.Krew("install", validPlugin).RunOrFail()
@@ -60,8 +58,7 @@ func TestKrewInstallReRun(t *testing.T) {
6058

6159
func TestKrewInstallUnsafe(t *testing.T) {
6260
skipShort(t)
63-
test, cleanup := NewTest(t)
64-
defer cleanup()
61+
test := NewTest(t)
6562
test.WithDefaultIndex()
6663

6764
cases := []string{
@@ -86,8 +83,7 @@ func TestKrewInstallUnsafe(t *testing.T) {
8683
func TestKrewInstall_MultiplePositionalArgs(t *testing.T) {
8784
skipShort(t)
8885

89-
test, cleanup := NewTest(t)
90-
defer cleanup()
86+
test := NewTest(t)
9187

9288
test.WithDefaultIndex().Krew("install", validPlugin, validPlugin2).RunOrFailOutput()
9389
test.AssertExecutableInPATH("kubectl-" + validPlugin)
@@ -97,8 +93,7 @@ func TestKrewInstall_MultiplePositionalArgs(t *testing.T) {
9793
func TestKrewInstall_Stdin(t *testing.T) {
9894
skipShort(t)
9995

100-
test, cleanup := NewTest(t)
101-
defer cleanup()
96+
test := NewTest(t)
10297

10398
test.WithDefaultIndex().WithStdin(strings.NewReader(validPlugin + "\n" + validPlugin2)).
10499
Krew("install").RunOrFailOutput()
@@ -110,8 +105,7 @@ func TestKrewInstall_Stdin(t *testing.T) {
110105
func TestKrewInstall_StdinAndPositionalArguments(t *testing.T) {
111106
skipShort(t)
112107

113-
test, cleanup := NewTest(t)
114-
defer cleanup()
108+
test := NewTest(t)
115109

116110
// when stdin is detected, it's ignored in favor of positional arguments
117111
test.WithDefaultIndex().
@@ -124,8 +118,7 @@ func TestKrewInstall_StdinAndPositionalArguments(t *testing.T) {
124118
func TestKrewInstall_ExplicitDefaultIndex(t *testing.T) {
125119
skipShort(t)
126120

127-
test, cleanup := NewTest(t)
128-
defer cleanup()
121+
test := NewTest(t)
129122

130123
test.Krew("install", "default/"+validPlugin).RunOrFail()
131124
test.AssertExecutableInPATH("kubectl-" + validPlugin)
@@ -135,8 +128,7 @@ func TestKrewInstall_ExplicitDefaultIndex(t *testing.T) {
135128
func TestKrewInstall_CustomIndex(t *testing.T) {
136129
skipShort(t)
137130

138-
test, cleanup := NewTest(t)
139-
defer cleanup()
131+
test := NewTest(t)
140132

141133
test.WithDefaultIndex().WithCustomIndexFromDefault("foo")
142134
test.Krew("install", "foo/"+validPlugin).RunOrFail()
@@ -152,8 +144,7 @@ func TestKrewInstall_CustomIndex(t *testing.T) {
152144
func TestKrewInstallNoSecurityWarningForCustomIndex(t *testing.T) {
153145
skipShort(t)
154146

155-
test, cleanup := NewTest(t)
156-
defer cleanup()
147+
test := NewTest(t)
157148

158149
test.WithDefaultIndex().WithCustomIndexFromDefault("foo")
159150
out := string(test.Krew("install", "foo/"+validPlugin).RunOrFailOutput())
@@ -165,8 +156,7 @@ func TestKrewInstallNoSecurityWarningForCustomIndex(t *testing.T) {
165156
func TestKrewInstall_Manifest(t *testing.T) {
166157
skipShort(t)
167158

168-
test, cleanup := NewTest(t)
169-
defer cleanup()
159+
test := NewTest(t)
170160

171161
test.Krew("install",
172162
"--manifest", filepath.Join("testdata", validPlugin+constants.ManifestExtension)).
@@ -178,8 +168,7 @@ func TestKrewInstall_Manifest(t *testing.T) {
178168
func TestKrewInstall_ManifestURL(t *testing.T) {
179169
skipShort(t)
180170

181-
test, cleanup := NewTest(t)
182-
defer cleanup()
171+
test := NewTest(t)
183172
srv, shutdown := localTestServer()
184173
defer shutdown()
185174

@@ -193,8 +182,7 @@ func TestKrewInstall_ManifestURL(t *testing.T) {
193182
func TestKrewInstall_ManifestAndArchive(t *testing.T) {
194183
skipShort(t)
195184

196-
test, cleanup := NewTest(t)
197-
defer cleanup()
185+
test := NewTest(t)
198186

199187
test.Krew("install",
200188
"--manifest", filepath.Join("testdata", fooPlugin+constants.ManifestExtension),
@@ -207,8 +195,7 @@ func TestKrewInstall_ManifestAndArchive(t *testing.T) {
207195
func TestKrewInstall_OnlyArchive(t *testing.T) {
208196
skipShort(t)
209197

210-
test, cleanup := NewTest(t)
211-
defer cleanup()
198+
test := NewTest(t)
212199

213200
_, err := test.Krew("install",
214201
"--archive", filepath.Join("testdata", fooPlugin+".tar.gz")).
@@ -221,8 +208,7 @@ func TestKrewInstall_OnlyArchive(t *testing.T) {
221208
func TestKrewInstall_ManifestArgsAreMutuallyExclusive(t *testing.T) {
222209
skipShort(t)
223210

224-
test, cleanup := NewTest(t)
225-
defer cleanup()
211+
test := NewTest(t)
226212
srv, shutdown := localTestServer()
227213
defer shutdown()
228214

@@ -237,8 +223,7 @@ func TestKrewInstall_ManifestArgsAreMutuallyExclusive(t *testing.T) {
237223
func TestKrewInstall_NoManifestArgsWhenPositionalArgsSpecified(t *testing.T) {
238224
skipShort(t)
239225

240-
test, cleanup := NewTest(t)
241-
defer cleanup()
226+
test := NewTest(t)
242227

243228
_, err := test.Krew("install", validPlugin,
244229
"--manifest", filepath.Join("testdata", fooPlugin+constants.ManifestExtension),

0 commit comments

Comments
 (0)