Skip to content

Commit 92addb5

Browse files
gandarezgandarez
authored
Merge pull request #1151 from wakatime/misc/usetesting-lint
Add new linter usetesting
2 parents 93ce478 + d02f5df commit 92addb5

File tree

7 files changed

+20
-58
lines changed

7 files changed

+20
-58
lines changed

‎.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ linters:
1818
- revive
1919
- testpackage
2020
- unconvert
21+
- usetesting
2122
- usestdlibvars
2223
- whitespace
2324
- wsl
@@ -54,6 +55,9 @@ linters-settings:
5455
- name: unused-receiver
5556
- name: var-declaration
5657
- name: var-naming
58+
usetesting:
59+
os-setenv: true
60+
os-temp-dir: true
5761
issues:
5862
exclude-use-default: false
5963
exclude-dirs:

‎cmd/logfile/logfile_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ func TestLoadParams(t *testing.T) {
132132
v.Set("settings.debug", test.ViperDebug)
133133
v.Set("verbose", test.ViperDebugConfig)
134134

135-
err := os.Setenv("WAKATIME_HOME", test.EnvVar)
136-
require.NoError(t, err)
137-
138-
defer os.Unsetenv("WAKATIME_HOME")
135+
t.Setenv("WAKATIME_HOME", test.EnvVar)
139136

140137
params, err := logfile.LoadParams(ctx, v)
141138
require.NoError(t, err)

‎cmd/params/params_test.go

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,10 +2093,7 @@ func TestLoadParams_ApiKey_FromVault_Err_Darwin(t *testing.T) {
20932093
func TestLoadAPIParams_APIKeyFromEnv(t *testing.T) {
20942094
v := viper.New()
20952095

2096-
err := os.Setenv("WAKATIME_API_KEY", "00000000-0000-4000-8000-000000000000")
2097-
require.NoError(t, err)
2098-
2099-
defer os.Unsetenv("WAKATIME_API_KEY")
2096+
t.Setenv("WAKATIME_API_KEY", "00000000-0000-4000-8000-000000000000")
21002097

21012098
params, err := cmdparams.LoadAPIParams(context.Background(), v)
21022099
require.NoError(t, err)
@@ -2107,12 +2104,9 @@ func TestLoadAPIParams_APIKeyFromEnv(t *testing.T) {
21072104
func TestLoadAPIParams_APIKeyFromEnvInvalid(t *testing.T) {
21082105
v := viper.New()
21092106

2110-
err := os.Setenv("WAKATIME_API_KEY", "00000000-0000-4000-0000-000000000000")
2111-
require.NoError(t, err)
2107+
t.Setenv("WAKATIME_API_KEY", "00000000-0000-4000-0000-000000000000")
21122108

2113-
defer os.Unsetenv("WAKATIME_API_KEY")
2114-
2115-
_, err = cmdparams.LoadAPIParams(context.Background(), v)
2109+
_, err := cmdparams.LoadAPIParams(context.Background(), v)
21162110
require.Error(t, err)
21172111

21182112
var errauth api.ErrAuth
@@ -2125,10 +2119,7 @@ func TestLoadAPIParams_APIKeyFromEnv_ConfigTakesPrecedence(t *testing.T) {
21252119
v := viper.New()
21262120
v.Set("settings.api_key", "00000000-0000-4000-8000-000000000000")
21272121

2128-
err := os.Setenv("WAKATIME_API_KEY", "10000000-0000-4000-8000-000000000000")
2129-
require.NoError(t, err)
2130-
2131-
defer os.Unsetenv("WAKATIME_API_KEY")
2122+
t.Setenv("WAKATIME_API_KEY", "10000000-0000-4000-8000-000000000000")
21322123

21332124
params, err := cmdparams.LoadAPIParams(context.Background(), v)
21342125
require.NoError(t, err)
@@ -2370,10 +2361,7 @@ func TestLoadAPIParams_ProxyURL_UserDefinedTakesPrecedenceOverEnvironment(t *tes
23702361
v.Set("key", "00000000-0000-4000-8000-000000000000")
23712362
v.Set("proxy", "https://john:[email protected]:8888")
23722363

2373-
err := os.Setenv("HTTPS_PROXY", "https://papa:[email protected]:9000")
2374-
require.NoError(t, err)
2375-
2376-
defer os.Unsetenv("HTTPS_PROXY")
2364+
t.Setenv("HTTPS_PROXY", "https://papa:[email protected]:9000")
23772365

23782366
params, err := cmdparams.LoadAPIParams(context.Background(), v)
23792367
require.NoError(t, err)
@@ -2396,10 +2384,7 @@ func TestLoadAPIParams_ProxyURL_FromEnvironment(t *testing.T) {
23962384
v := viper.New()
23972385
v.Set("key", "00000000-0000-4000-8000-000000000000")
23982386

2399-
err := os.Setenv("HTTPS_PROXY", "https://john:[email protected]:8888")
2400-
require.NoError(t, err)
2401-
2402-
defer os.Unsetenv("HTTPS_PROXY")
2387+
t.Setenv("HTTPS_PROXY", "https://john:[email protected]:8888")
24032388

24042389
params, err := cmdparams.LoadAPIParams(context.Background(), v)
24052390
require.NoError(t, err)
@@ -2411,10 +2396,7 @@ func TestLoadAPIParams_ProxyURL_NoProxyFromEnvironment(t *testing.T) {
24112396
v := viper.New()
24122397
v.Set("key", "00000000-0000-4000-8000-000000000000")
24132398

2414-
err := os.Setenv("NO_PROXY", "https://some.org,https://api.wakatime.com")
2415-
require.NoError(t, err)
2416-
2417-
defer os.Unsetenv("NO_PROXY")
2399+
t.Setenv("NO_PROXY", "https://some.org,https://api.wakatime.com")
24182400

24192401
params, err := cmdparams.LoadAPIParams(context.Background(), v)
24202402
require.NoError(t, err)
@@ -2470,10 +2452,7 @@ func TestLoadAPIParams_Hostname_FlagTakesPrecedence(t *testing.T) {
24702452
v.Set("hostname", "my-machine")
24712453
v.Set("settings.hostname", "ignored")
24722454

2473-
err := os.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
2474-
require.NoError(t, err)
2475-
2476-
defer os.Unsetenv("GITPOD_WORKSPACE_ID")
2455+
t.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
24772456

24782457
params, err := cmdparams.LoadAPIParams(context.Background(), v)
24792458
require.NoError(t, err)
@@ -2497,10 +2476,7 @@ func TestLoadAPIParams_Hostname_ConfigTakesPrecedence(t *testing.T) {
24972476
v.Set("key", "00000000-0000-4000-8000-000000000000")
24982477
v.Set("settings.hostname", "my-machine")
24992478

2500-
err := os.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
2501-
require.NoError(t, err)
2502-
2503-
defer os.Unsetenv("GITPOD_WORKSPACE_ID")
2479+
t.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
25042480

25052481
params, err := cmdparams.LoadAPIParams(context.Background(), v)
25062482
require.NoError(t, err)
@@ -2512,10 +2488,7 @@ func TestLoadAPIParams_Hostname_FromGitpodEnv(t *testing.T) {
25122488
v := viper.New()
25132489
v.Set("key", "00000000-0000-4000-8000-000000000000")
25142490

2515-
err := os.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
2516-
require.NoError(t, err)
2517-
2518-
defer os.Unsetenv("GITPOD_WORKSPACE_ID")
2491+
t.Setenv("GITPOD_WORKSPACE_ID", "gitpod")
25192492

25202493
params, err := cmdparams.LoadAPIParams(context.Background(), v)
25212494
require.NoError(t, err)

‎pkg/file/file_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func openFile(name string, flag int, perm os.FileMode) (*os.File, error) {
2525
}
2626

2727
// openFileNolog is the Windows implementation of OpenFile.
28-
func openFileNolog(name string, flag int, perm os.FileMode) (*os.File, error) {
28+
func openFileNolog(name string, flag int, _ os.FileMode) (*os.File, error) {
2929
if name == "" {
3030
return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT}
3131
}

‎pkg/ini/ini_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,7 @@ func TestFilePath(t *testing.T) {
154154
v := viper.New()
155155
v.Set("config", test.ViperValue)
156156

157-
err := os.Setenv("WAKATIME_HOME", test.EnvVar)
158-
require.NoError(t, err)
159-
160-
defer os.Unsetenv("WAKATIME_HOME")
157+
t.Setenv("WAKATIME_HOME", test.EnvVar)
161158

162159
configFilepath, err := ini.FilePath(ctx, v)
163160
require.NoError(t, err)
@@ -196,10 +193,7 @@ func TestInternalFilePath(t *testing.T) {
196193
v := viper.New()
197194
v.Set("internal-config", test.ViperValue)
198195

199-
err := os.Setenv("WAKATIME_HOME", test.EnvVar)
200-
require.NoError(t, err)
201-
202-
defer os.Unsetenv("WAKATIME_HOME")
196+
t.Setenv("WAKATIME_HOME", test.EnvVar)
203197

204198
configFilepath, err := ini.InternalFilePath(ctx, v)
205199
require.NoError(t, err)

‎pkg/offline/legacy_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ func TestQueueFilepathLegacy(t *testing.T) {
3939

4040
for name, test := range tests {
4141
t.Run(name, func(t *testing.T) {
42-
err := os.Setenv("WAKATIME_HOME", test.EnvVar)
43-
require.NoError(t, err)
44-
45-
defer os.Unsetenv("WAKATIME_HOME")
42+
t.Setenv("WAKATIME_HOME", test.EnvVar)
4643

4744
v := viper.New()
4845
queueFilepath, err := offline.QueueFilepathLegacy(ctx, v)

‎pkg/offline/offline_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ func TestQueueFilepath(t *testing.T) {
3939

4040
for name, test := range tests {
4141
t.Run(name, func(t *testing.T) {
42-
err := os.Setenv("WAKATIME_HOME", test.EnvVar)
43-
require.NoError(t, err)
44-
45-
defer os.Unsetenv("WAKATIME_HOME")
42+
t.Setenv("WAKATIME_HOME", test.EnvVar)
4643

4744
folder, err := ini.WakaResourcesDir(ctx)
4845
require.NoError(t, err)

0 commit comments

Comments
 (0)