Skip to content

Commit a59679c

Browse files
use t.Setenv instead of os.Setenv in tests
1 parent 24afb2d commit a59679c

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

arduino/cores/packagemanager/package_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ func TestBoardOrdering(t *testing.T) {
431431
}
432432

433433
func TestFindToolsRequiredForBoard(t *testing.T) {
434-
os.Setenv("ARDUINO_DATA_DIR", dataDir1.String())
434+
t.Setenv("ARDUINO_DATA_DIR", dataDir1.String())
435435
configuration.Settings = configuration.Init("")
436436
pmb := NewBuilder(
437437
dataDir1,

commands/board/list_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020
"net/http"
2121
"net/http/httptest"
22-
"os"
2322
"testing"
2423

2524
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
@@ -110,7 +109,7 @@ func TestBoardDetectionViaAPIWithNonUSBPort(t *testing.T) {
110109

111110
func TestBoardIdentifySorting(t *testing.T) {
112111
dataDir := paths.TempDir().Join("test", "data_dir")
113-
os.Setenv("ARDUINO_DATA_DIR", dataDir.String())
112+
t.Setenv("ARDUINO_DATA_DIR", dataDir.String())
114113
dataDir.MkdirAll()
115114
defer paths.TempDir().Join("test").RemoveAll()
116115

commands/core/search_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package core
1717

1818
import (
19-
"os"
2019
"testing"
2120

2221
"github.com/arduino/arduino-cli/configuration"
@@ -30,8 +29,8 @@ func TestPlatformSearch(t *testing.T) {
3029

3130
dataDir := paths.TempDir().Join("test", "data_dir")
3231
downloadDir := paths.TempDir().Join("test", "staging")
33-
os.Setenv("ARDUINO_DATA_DIR", dataDir.String())
34-
os.Setenv("ARDUINO_DOWNLOADS_DIR", downloadDir.String())
32+
t.Setenv("ARDUINO_DATA_DIR", dataDir.String())
33+
t.Setenv("ARDUINO_DOWNLOADS_DIR", downloadDir.String())
3534
dataDir.MkdirAll()
3635
downloadDir.MkdirAll()
3736
defer paths.TempDir().Join("test").RemoveAll()
@@ -323,8 +322,8 @@ func TestPlatformSearch(t *testing.T) {
323322
func TestPlatformSearchSorting(t *testing.T) {
324323
dataDir := paths.TempDir().Join("test", "data_dir")
325324
downloadDir := paths.TempDir().Join("test", "staging")
326-
os.Setenv("ARDUINO_DATA_DIR", dataDir.String())
327-
os.Setenv("ARDUINO_DOWNLOADS_DIR", downloadDir.String())
325+
t.Setenv("ARDUINO_DATA_DIR", dataDir.String())
326+
t.Setenv("ARDUINO_DOWNLOADS_DIR", downloadDir.String())
328327
dataDir.MkdirAll()
329328
downloadDir.MkdirAll()
330329
defer paths.TempDir().Join("test").RemoveAll()

internal/integrationtest/compile_3/core_caching_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package compile_test
1717

1818
import (
19+
"slices"
1920
"strings"
2021
"testing"
21-
"slices"
2222

2323
"github.com/arduino/arduino-cli/internal/integrationtest"
2424
"github.com/arduino/go-paths-helper"

0 commit comments

Comments
 (0)