From c9b29d14a9b5da8cbc2ea2ef663e5f4d5f2d097e Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Mon, 8 Jan 2024 14:41:07 +0100 Subject: [PATCH 1/2] test: add missing file close --- internal/integrationtest/config/config_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/integrationtest/config/config_test.go b/internal/integrationtest/config/config_test.go index 99544f5d0b3..36d57d2d347 100644 --- a/internal/integrationtest/config/config_test.go +++ b/internal/integrationtest/config/config_test.go @@ -827,6 +827,7 @@ func TestInitializationOrderOfConfigThroughFlagAndEnv(t *testing.T) { require.NoError(t, err) _, err = f.WriteString(content) require.NoError(t, err) + require.NoError(t, f.Close()) } tmp := t.TempDir() cliConfig, envConfig := paths.New(filepath.Join(tmp, "cli.yaml")), paths.New(filepath.Join(tmp, "env.yaml")) From 2bf2f58d1679155e6c0182c48679411bc249ad87 Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Tue, 9 Jan 2024 08:22:31 +0100 Subject: [PATCH 2/2] refactor --- internal/integrationtest/config/config_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/internal/integrationtest/config/config_test.go b/internal/integrationtest/config/config_test.go index 36d57d2d347..2d830978c98 100644 --- a/internal/integrationtest/config/config_test.go +++ b/internal/integrationtest/config/config_test.go @@ -822,17 +822,10 @@ func TestInitializationOrderOfConfigThroughFlagAndEnv(t *testing.T) { env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t) defer env.CleanUp() - createConfig := func(path *paths.Path, content string) { - f, err := path.Create() - require.NoError(t, err) - _, err = f.WriteString(content) - require.NoError(t, err) - require.NoError(t, f.Close()) - } tmp := t.TempDir() cliConfig, envConfig := paths.New(filepath.Join(tmp, "cli.yaml")), paths.New(filepath.Join(tmp, "env.yaml")) - createConfig(cliConfig, `cli-test: "test"`) - createConfig(envConfig, `env-test: "test"`) + cliConfig.WriteFile([]byte(`cli-test: "test"`)) + envConfig.WriteFile([]byte(`env-test: "test"`)) // No flag nor env specified. stdout, _, err := cli.Run("config", "dump", "--format", "json")