Skip to content

Commit 4295ac0

Browse files
authored
test: close plugin manager in tests cleanup (#10904)
1 parent d4213d7 commit 4295ac0

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

pkg/plugin/index_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestManager_Update(t *testing.T) {
2626

2727
manager, err := plugin.NewManager(plugin.WithIndexURL(ts.URL + "/index.yaml"))
2828
require.NoError(t, err)
29+
t.Cleanup(func() { _ = manager.Close() })
2930
err = manager.Update(t.Context(), plugin.Options{})
3031
require.NoError(t, err)
3132

@@ -77,6 +78,7 @@ bar A bar plugin
7778
var got bytes.Buffer
7879
m, err := plugin.NewManager(plugin.WithWriter(&got))
7980
require.NoError(t, err)
81+
t.Cleanup(func() { _ = m.Close() })
8082
err = m.Search(t.Context(), tt.keyword)
8183
if tt.wantErr != "" {
8284
require.ErrorContains(t, err, tt.wantErr)

pkg/plugin/manager_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ func TestManager_Uninstall(t *testing.T) {
253253
// Uninstall the plugin
254254
m, err := plugin.NewManager()
255255
require.NoError(t, err)
256+
t.Cleanup(func() { _ = m.Close() })
256257
err = m.Uninstall(ctx, pluginName)
257258
require.NoError(t, err)
258259
assert.NoDirExists(t, pluginDir)
@@ -265,6 +266,7 @@ func TestManager_Uninstall(t *testing.T) {
265266

266267
m, err := plugin.NewManager()
267268
require.NoError(t, err)
269+
t.Cleanup(func() { _ = m.Close() })
268270
err = m.Uninstall(ctx, pluginName)
269271
require.NoError(t, err)
270272
assert.Equal(t, "2021-08-25T12:20:30Z\tERROR\t[plugin] No such plugin\n", buf.String())
@@ -281,6 +283,7 @@ func TestManager_Uninstall(t *testing.T) {
281283
// surfaces the error (not "No such plugin") and removes nothing.
282284
m, err := plugin.NewManager()
283285
require.NoError(t, err)
286+
t.Cleanup(func() { _ = m.Close() })
284287
err = m.Uninstall(ctx, "../secret")
285288
require.Error(t, err)
286289
assert.FileExists(t, sentinel)
@@ -312,6 +315,7 @@ description: A simple test plugin`
312315
var got bytes.Buffer
313316
manager, err := plugin.NewManager(plugin.WithWriter(&got))
314317
require.NoError(t, err)
318+
t.Cleanup(func() { _ = manager.Close() })
315319

316320
// Get Information for the plugin
317321
err = manager.Information(pluginName)
@@ -365,6 +369,7 @@ func TestManager_LoadAll(t *testing.T) {
365369
t.Setenv("XDG_DATA_HOME", tt.dir)
366370
m, err := plugin.NewManager()
367371
require.NoError(t, err)
372+
t.Cleanup(func() { _ = m.Close() })
368373
got, err := m.LoadAll(t.Context())
369374
require.NoError(t, err)
370375
require.Len(t, got, len(tt.want))
@@ -394,6 +399,7 @@ func TestManager_Upgrade(t *testing.T) {
394399
ctx := t.Context()
395400
m, err := plugin.NewManager()
396401
require.NoError(t, err)
402+
t.Cleanup(func() { _ = m.Close() })
397403

398404
// verify initial version
399405
verifyVersion(t, ctx, m, pluginName, pluginVersion)

pkg/plugin/manager_unix_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ func TestManager_Install(t *testing.T) {
226226

227227
manager, err := plugin.NewManager(plugin.WithLogger(logger))
228228
require.NoError(t, err)
229+
t.Cleanup(func() { _ = manager.Close() })
230+
229231
got, err := manager.Install(ctx, tt.pluginName, plugin.Options{
230232
Platform: ftypes.Platform{
231233
Platform: &v1.Platform{

0 commit comments

Comments
 (0)