Skip to content

Commit 8b18ae8

Browse files
Peter Steinbergersalmonumbrella
andcommitted
fix(lint): resolve wsl lint findings (openclaw#35)
Thanks @salmonumbrella. Co-authored-by: salmonumbrella <salmonumbrella@users.noreply.github.com>
1 parent 8520836 commit 8b18ae8

6 files changed

Lines changed: 40 additions & 14 deletions

File tree

internal/input/prompt_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func TestPromptLineFrom(t *testing.T) {
2323
if err != nil {
2424
t.Fatalf("PromptLineFrom: %v", err)
2525
}
26+
2627
if line != "hello" {
2728
t.Fatalf("unexpected line: %q", line)
2829
}

internal/secrets/store_integration_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func TestSetAndGetSecret_FileBackend(t *testing.T) {
2525
if err := SetSecret("test/key", []byte("value")); err != nil {
2626
t.Fatalf("SetSecret: %v", err)
2727
}
28+
2829
if val, err := GetSecret("test/key"); err != nil {
2930
t.Fatalf("GetSecret: %v", err)
3031
} else if string(val) != "value" {
@@ -40,6 +41,7 @@ func TestKeyringStore_TokenRoundTrip(t *testing.T) {
4041
if err := store.SetToken("a@b.com", tok); err != nil {
4142
t.Fatalf("SetToken: %v", err)
4243
}
44+
4345
if got, err := store.GetToken("a@b.com"); err != nil {
4446
t.Fatalf("GetToken: %v", err)
4547
} else if got.RefreshToken != "rt" {
@@ -50,6 +52,7 @@ func TestKeyringStore_TokenRoundTrip(t *testing.T) {
5052
if err != nil {
5153
t.Fatalf("Keys: %v", err)
5254
}
55+
5356
if len(keys) == 0 {
5457
t.Fatalf("expected keys")
5558
}

internal/secrets/store_more_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func TestKeyringStore_ListDeleteDefault(t *testing.T) {
3030
if err != nil {
3131
t.Fatalf("ListTokens: %v", err)
3232
}
33+
3334
if len(tokens) != 2 {
3435
t.Fatalf("expected 2 tokens, got %d", len(tokens))
3536
}
@@ -38,20 +39,19 @@ func TestKeyringStore_ListDeleteDefault(t *testing.T) {
3839
if err != nil {
3940
t.Fatalf("DeleteToken: %v", err)
4041
}
41-
_, err = store.GetToken(tok1.Email)
42-
if err == nil {
42+
43+
if _, getErr := store.GetToken(tok1.Email); getErr == nil {
4344
t.Fatalf("expected error for deleted token")
4445
}
4546

4647
err = store.SetDefaultAccount("a@b.com")
4748
if err != nil {
4849
t.Fatalf("SetDefaultAccount: %v", err)
4950
}
50-
def, err := store.GetDefaultAccount()
51-
if err != nil {
51+
52+
if def, err := store.GetDefaultAccount(); err != nil {
5253
t.Fatalf("GetDefaultAccount: %v", err)
53-
}
54-
if def != "a@b.com" {
54+
} else if def != "a@b.com" {
5555
t.Fatalf("unexpected default account: %q", def)
5656
}
5757

@@ -65,6 +65,7 @@ func TestParseTokenKey(t *testing.T) {
6565
if email, ok := ParseTokenKey("token:a@b.com"); !ok || email != "a@b.com" {
6666
t.Fatalf("unexpected parse: %q ok=%v", email, ok)
6767
}
68+
6869
if _, ok := ParseTokenKey("nope"); ok {
6970
t.Fatalf("expected invalid token key")
7071
}
@@ -74,6 +75,7 @@ func TestAllowedBackends(t *testing.T) {
7475
if _, err := allowedBackends(KeyringBackendInfo{Value: "keychain"}); err != nil {
7576
t.Fatalf("keychain allowed: %v", err)
7677
}
78+
7779
if _, err := allowedBackends(KeyringBackendInfo{Value: "file"}); err != nil {
7880
t.Fatalf("file allowed: %v", err)
7981
}
@@ -88,6 +90,7 @@ func TestWrapKeychainError(t *testing.T) {
8890

8991
return
9092
}
93+
9194
if !errors.Is(wrapped, errTestKeychain) || wrapped.Error() != errTestKeychain.Error() {
9295
t.Fatalf("expected passthrough error, got: %v", wrapped)
9396
}

internal/tracking/deploy_test.go

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ func TestDeployWorker_Success(t *testing.T) {
119119
if err != nil {
120120
t.Fatalf("DeployWorker: %v", err)
121121
}
122+
122123
if dbID != "db-create" {
123124
t.Fatalf("unexpected db id: %q", dbID)
124125
}
@@ -139,6 +140,7 @@ func TestEnsureD1Database_InfoFallback(t *testing.T) {
139140
if err != nil {
140141
t.Fatalf("ensureD1Database: %v", err)
141142
}
143+
142144
if dbID != "db-info" {
143145
t.Fatalf("unexpected db id: %q", dbID)
144146
}
@@ -157,32 +159,43 @@ func TestWriteWranglerConfig(t *testing.T) {
157159
if err != nil {
158160
t.Fatalf("read config: %v", err)
159161
}
162+
160163
content := string(data)
161164
if !strings.Contains(content, "worker-name") || strings.Contains(content, "old") {
162165
t.Fatalf("missing name replacement: %q", content)
163166
}
167+
164168
if !strings.Contains(content, "db-name") {
165169
t.Fatalf("missing database_name replacement: %q", content)
166170
}
171+
167172
if !strings.Contains(content, "db-id") {
168173
t.Fatalf("missing database_id replacement: %q", content)
169174
}
170175
}
171176

172177
func writeWranglerFiles(t *testing.T, dir string) {
173178
t.Helper()
174-
if err := os.WriteFile(filepath.Join(dir, "wrangler.toml"), []byte("name = \"old\"\ndatabase_name = \"old\"\ndatabase_id = \"old\"\n"), 0o600); err != nil {
179+
wranglerPath := filepath.Join(dir, "wrangler.toml")
180+
181+
err := os.WriteFile(wranglerPath, []byte("name = \"old\"\ndatabase_name = \"old\"\ndatabase_id = \"old\"\n"), 0o600)
182+
if err != nil {
175183
t.Fatalf("write wrangler.toml: %v", err)
176184
}
177-
if err := os.WriteFile(filepath.Join(dir, "schema.sql"), []byte(""), 0o600); err != nil {
185+
186+
schemaPath := filepath.Join(dir, "schema.sql")
187+
188+
err = os.WriteFile(schemaPath, []byte(""), 0o600)
189+
if err != nil {
178190
t.Fatalf("write schema.sql: %v", err)
179191
}
180192
}
181193

182194
func writeWranglerStub(t *testing.T, dir string) string {
183195
t.Helper()
184196
path := filepath.Join(dir, "wrangler")
185-
script := `#!/bin/sh
197+
198+
err := os.WriteFile(path, []byte(`#!/bin/sh
186199
set -e
187200
cmd="$1"
188201
shift
@@ -222,8 +235,8 @@ case "$cmd" in
222235
esac
223236
echo "unexpected args" >&2
224237
exit 2
225-
`
226-
if err := os.WriteFile(path, []byte(script), 0o700); err != nil {
238+
`), 0o700)
239+
if err != nil {
227240
t.Fatalf("write wrangler stub: %v", err)
228241
}
229242

internal/tracking/secrets_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ func TestSaveAndLoadSecrets(t *testing.T) {
2222
if err := SaveSecrets("a@b.com", "track", "admin"); err != nil {
2323
t.Fatalf("SaveSecrets: %v", err)
2424
}
25+
2526
track, admin, err := LoadSecrets("a@b.com")
2627
if err != nil {
2728
t.Fatalf("LoadSecrets: %v", err)
2829
}
30+
2931
if track != "track" || admin != "admin" {
3032
t.Fatalf("unexpected secrets: %q %q", track, admin)
3133
}
@@ -37,6 +39,7 @@ func TestLoadSecrets_LegacyFallback(t *testing.T) {
3739
if err := secrets.SetSecret(legacyTrackingKeySecretKey, []byte("legacy-track")); err != nil {
3840
t.Fatalf("SetSecret legacy: %v", err)
3941
}
42+
4043
if err := secrets.SetSecret(legacyAdminKeySecretKey, []byte("legacy-admin")); err != nil {
4144
t.Fatalf("SetSecret legacy admin: %v", err)
4245
}
@@ -45,6 +48,7 @@ func TestLoadSecrets_LegacyFallback(t *testing.T) {
4548
if err != nil {
4649
t.Fatalf("LoadSecrets: %v", err)
4750
}
51+
4852
if track != "legacy-track" || admin != "legacy-admin" {
4953
t.Fatalf("unexpected legacy secrets: %q %q", track, admin)
5054
}

scripts/gen-auth-services-md_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import (
88
)
99

1010
func TestMainUpdatesReadme(t *testing.T) {
11-
dir := t.TempDir()
1211
orig, _ := os.Getwd()
12+
13+
dir := t.TempDir()
1314
if err := os.Chdir(dir); err != nil {
1415
t.Fatalf("chdir: %v", err)
1516
}
1617

1718
t.Cleanup(func() { _ = os.Chdir(orig) })
1819

1920
readme := filepath.Join(dir, "README.md")
20-
content := "# Test\n" + startMarker + "\n" + endMarker + "\n"
21-
if err := os.WriteFile(readme, []byte(content), 0o600); err != nil {
21+
if err := os.WriteFile(readme, []byte("# Test\n"+startMarker+"\n"+endMarker+"\n"), 0o600); err != nil {
2222
t.Fatalf("write README: %v", err)
2323
}
2424

@@ -28,10 +28,12 @@ func TestMainUpdatesReadme(t *testing.T) {
2828
if err != nil {
2929
t.Fatalf("read README: %v", err)
3030
}
31+
3132
text := string(updated)
3233
if !strings.Contains(text, startMarker) || !strings.Contains(text, endMarker) {
3334
t.Fatalf("missing markers: %q", text)
3435
}
36+
3537
if !strings.Contains(text, "|") {
3638
t.Fatalf("expected markdown table: %q", text)
3739
}

0 commit comments

Comments
 (0)