fix(lint): tidy test lint findings (#35)
Thanks @salmonumbrella. Co-authored-by: salmonumbrella <salmonumbrella@users.noreply.github.com>
This commit is contained in:
parent
47c06796b0
commit
7beb1bc52f
@ -16,6 +16,7 @@ func TestConfigExists(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("ConfigExists: %v", err)
|
||||
}
|
||||
|
||||
if exists {
|
||||
t.Fatalf("expected config to be missing")
|
||||
}
|
||||
@ -24,10 +25,14 @@ func TestConfigExists(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("ConfigPath: %v", err)
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
|
||||
|
||||
err = os.MkdirAll(filepath.Dir(path), 0o700)
|
||||
if err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(path, []byte(`{}`), 0o600); err != nil {
|
||||
|
||||
err = os.WriteFile(path, []byte(`{}`), 0o600)
|
||||
if err != nil {
|
||||
t.Fatalf("write config: %v", err)
|
||||
}
|
||||
|
||||
@ -35,6 +40,7 @@ func TestConfigExists(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("ConfigExists (after write): %v", err)
|
||||
}
|
||||
|
||||
if !exists {
|
||||
t.Fatalf("expected config to exist")
|
||||
}
|
||||
@ -49,6 +55,7 @@ func TestKeepServiceAccountLegacyPath(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("KeepServiceAccountLegacyPath: %v", err)
|
||||
}
|
||||
|
||||
if !strings.Contains(path, "keep-sa-User@Example.com.json") {
|
||||
t.Fatalf("unexpected path: %q", path)
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package googleauth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
@ -31,11 +32,11 @@ func TestHandleAccountsPage(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestFetchUserEmailDefault(t *testing.T) {
|
||||
if _, err := fetchUserEmailDefault(nil, nil); err == nil {
|
||||
if _, err := fetchUserEmailDefault(context.TODO(), nil); err == nil {
|
||||
t.Fatalf("expected missing token error")
|
||||
}
|
||||
|
||||
if _, err := fetchUserEmailDefault(nil, &oauth2.Token{}); err == nil {
|
||||
if _, err := fetchUserEmailDefault(context.TODO(), &oauth2.Token{}); err == nil {
|
||||
t.Fatalf("expected missing access token error")
|
||||
}
|
||||
|
||||
@ -44,7 +45,7 @@ func TestFetchUserEmailDefault(t *testing.T) {
|
||||
tok := &oauth2.Token{AccessToken: "access"}
|
||||
tok = tok.WithExtra(map[string]any{"id_token": idToken})
|
||||
|
||||
email, err := fetchUserEmailDefault(nil, tok)
|
||||
email, err := fetchUserEmailDefault(context.TODO(), tok)
|
||||
if err != nil {
|
||||
t.Fatalf("fetchUserEmailDefault: %v", err)
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@ import (
|
||||
|
||||
func TestPromptLineFrom(t *testing.T) {
|
||||
var stderr bytes.Buffer
|
||||
|
||||
u, err := ui.New(ui.Options{Stdout: &stderr, Stderr: &stderr, Color: "never"})
|
||||
if err != nil {
|
||||
t.Fatalf("ui.New: %v", err)
|
||||
@ -32,17 +33,20 @@ func TestPromptLineFrom(t *testing.T) {
|
||||
|
||||
func TestPromptLine(t *testing.T) {
|
||||
orig := os.Stdin
|
||||
|
||||
r, w, err := os.Pipe()
|
||||
if err != nil {
|
||||
t.Fatalf("pipe: %v", err)
|
||||
}
|
||||
|
||||
defer func() {
|
||||
_ = r.Close()
|
||||
os.Stdin = orig
|
||||
}()
|
||||
os.Stdin = r
|
||||
if _, err := w.WriteString("world\n"); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
_, writeErr := w.WriteString("world\n")
|
||||
if writeErr != nil {
|
||||
t.Fatalf("write: %v", writeErr)
|
||||
}
|
||||
_ = w.Close()
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func setupKeyringEnv(t *testing.T) {
|
||||
t.Helper()
|
||||
home := t.TempDir()
|
||||
t.Setenv("HOME", home)
|
||||
t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "xdg"))
|
||||
@ -63,7 +64,8 @@ func TestEnsureKeyringDir(t *testing.T) {
|
||||
t.Setenv("HOME", home)
|
||||
t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "xdg"))
|
||||
|
||||
if _, err := config.EnsureKeyringDir(); err != nil {
|
||||
_, err := config.EnsureKeyringDir()
|
||||
if err != nil {
|
||||
t.Fatalf("EnsureKeyringDir: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,6 +10,8 @@ import (
|
||||
"github.com/99designs/keyring"
|
||||
)
|
||||
|
||||
var errTestKeychain = errors.New("test -25308 error")
|
||||
|
||||
func TestKeyringStore_ListDeleteDefault(t *testing.T) {
|
||||
ring := keyring.NewArrayKeyring(nil)
|
||||
store := &KeyringStore{ring: ring}
|
||||
@ -31,14 +33,17 @@ func TestKeyringStore_ListDeleteDefault(t *testing.T) {
|
||||
t.Fatalf("expected 2 tokens, got %d", len(tokens))
|
||||
}
|
||||
|
||||
if err := store.DeleteToken(tok1.Email); err != nil {
|
||||
err = store.DeleteToken(tok1.Email)
|
||||
if err != nil {
|
||||
t.Fatalf("DeleteToken: %v", err)
|
||||
}
|
||||
if _, err := store.GetToken(tok1.Email); err == nil {
|
||||
_, err = store.GetToken(tok1.Email)
|
||||
if err == nil {
|
||||
t.Fatalf("expected error for deleted token")
|
||||
}
|
||||
|
||||
if err := store.SetDefaultAccount("a@b.com"); err != nil {
|
||||
err = store.SetDefaultAccount("a@b.com")
|
||||
if err != nil {
|
||||
t.Fatalf("SetDefaultAccount: %v", err)
|
||||
}
|
||||
def, err := store.GetDefaultAccount()
|
||||
@ -74,15 +79,15 @@ func TestAllowedBackends(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestWrapKeychainError(t *testing.T) {
|
||||
err := errors.New("test -25308 error")
|
||||
wrapped := wrapKeychainError(err)
|
||||
wrapped := wrapKeychainError(errTestKeychain)
|
||||
if runtime.GOOS == "darwin" {
|
||||
if wrapped == err || !strings.Contains(wrapped.Error(), "keychain is locked") {
|
||||
if !errors.Is(wrapped, errTestKeychain) || !strings.Contains(wrapped.Error(), "keychain is locked") {
|
||||
t.Fatalf("expected wrapped keychain error, got: %v", wrapped)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
if wrapped != err {
|
||||
if !errors.Is(wrapped, errTestKeychain) || wrapped.Error() != errTestKeychain.Error() {
|
||||
t.Fatalf("expected passthrough error, got: %v", wrapped)
|
||||
}
|
||||
}
|
||||
|
||||
@ -230,6 +230,7 @@ func TestOpenKeyringWithTimeout_Timeout(t *testing.T) {
|
||||
t.Cleanup(func() { keyringOpenFunc = originalOpen })
|
||||
|
||||
_, err = openKeyringWithTimeout(cfg, 10*time.Millisecond)
|
||||
|
||||
close(blockCh)
|
||||
|
||||
if err == nil {
|
||||
|
||||
@ -63,6 +63,7 @@ func TestDeployWorker_MissingWrangler(t *testing.T) {
|
||||
if err := os.WriteFile(filepath.Join(dir, "wrangler.toml"), []byte("name = \"x\"\n"), 0o600); err != nil {
|
||||
t.Fatalf("write wrangler.toml: %v", err)
|
||||
}
|
||||
|
||||
t.Setenv("PATH", dir)
|
||||
|
||||
_, err := DeployWorker(context.Background(), nil, DeployOptions{
|
||||
@ -225,5 +226,6 @@ exit 2
|
||||
if err := os.WriteFile(path, []byte(script), 0o700); err != nil {
|
||||
t.Fatalf("write wrangler stub: %v", err)
|
||||
}
|
||||
|
||||
return path
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func setupTrackingKeyringEnv(t *testing.T) {
|
||||
t.Helper()
|
||||
home := t.TempDir()
|
||||
t.Setenv("HOME", home)
|
||||
t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "xdg"))
|
||||
|
||||
@ -13,6 +13,7 @@ func TestMainUpdatesReadme(t *testing.T) {
|
||||
if err := os.Chdir(dir); err != nil {
|
||||
t.Fatalf("chdir: %v", err)
|
||||
}
|
||||
|
||||
t.Cleanup(func() { _ = os.Chdir(orig) })
|
||||
|
||||
readme := filepath.Join(dir, "README.md")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user