diff --git a/.gitignore b/.gitignore index b895456..47fcd12 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /timber coverage.html coverage.out +coverage-process.out tmp/ diff --git a/internal/cli/generate_test.go b/internal/cli/generate_test.go index 23aaa5c..abd8370 100644 --- a/internal/cli/generate_test.go +++ b/internal/cli/generate_test.go @@ -12,6 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/nnutter/timber/internal/testenv" ) func TestGenerateZshGeneratesWrapperCompletionAndAutoloadHelper(t *testing.T) { @@ -156,7 +158,7 @@ func buildTestTimberBinary(t *testing.T) string { require.NoError(t, err) envKeys := []string{"GOMODCACHE", "GOCACHE", "GOPROXY", "GOTOOLCHAIN"} - build := shellTestCommand(t, "go", "build", "-o", filepath.Join(binDir, "timber"), ".") + build := shellTestCommand(t, "go", testenv.BuildArgs(filepath.Join(binDir, "timber"), ".")...) build.Dir = repoRoot // testCommand isolates HOME, which would empty the module and build // caches; keep the real Go toolchain directories so the build stays diff --git a/internal/cli/review/activity_test.go b/internal/cli/review/activity_test.go index 8ab1b66..a7dede4 100644 --- a/internal/cli/review/activity_test.go +++ b/internal/cli/review/activity_test.go @@ -13,13 +13,12 @@ import ( ) func TestReviewRunningReportsLiveLockNotPersistedAttempt(t *testing.T) { - binary := buildGitReview(t) dir := featureRepo(t) path, err := review.WorktreePath(t.Context(), dir) require.NoError(t, err) check := func(cwd string, running bool) { t.Helper() - out, terminal, err := executeBinary(t, binary, cwd, "status", "--is-reviewing", "--json") + out, terminal, err := execute(t, cwd, "status", "--is-reviewing", "--json") require.NoError(t, err) require.Empty(t, terminal) want := `{"version":1,"command":"status","is_reviewing":false}` @@ -82,13 +81,14 @@ while [ ! -f "$TEST_RELEASED" ]; do sleep 0.05; done`) check(other, false) // A detached checkout without rebase metadata has no branch to check. git(t, dir, "checkout", "--detach") - out, terminal, err := executeBinary(t, binary, dir, "status", "--is-reviewing", "--json") + out, terminal, err := execute(t, dir, "status", "--is-reviewing", "--json") require.Error(t, err) require.Empty(t, terminal) require.Contains(t, out, `"status":"error"`) } func TestReviewRunningOutsideRepository(t *testing.T) { + t.Parallel() out, terminal, err := execute(t, t.TempDir(), "status", "--is-reviewing", "--json") require.Error(t, err) require.Empty(t, terminal) @@ -96,13 +96,13 @@ func TestReviewRunningOutsideRepository(t *testing.T) { } func TestStatusIsReviewingTerminalAndConflicts(t *testing.T) { - binary := buildGitReview(t) + t.Parallel() dir := featureRepo(t) - out, terminal, err := executeBinary(t, binary, dir, "status", "--is-reviewing") + out, terminal, err := execute(t, dir, "status", "--is-reviewing") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, "Is reviewing: false") - out, terminal, err = executeBinary(t, binary, dir, "status", "--is-reviewing", "--json") + out, terminal, err = execute(t, dir, "status", "--is-reviewing", "--json") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, `"is_reviewing"`) @@ -110,7 +110,7 @@ func TestStatusIsReviewingTerminalAndConflicts(t *testing.T) { {"status", "--is-reviewing", "--needs-review", "--json"}, {"status", "--is-reviewing", "--verbose", "--json"}, } { - out, terminal, err := executeBinary(t, binary, dir, args...) + out, terminal, err := execute(t, dir, args...) require.Error(t, err) require.Empty(t, terminal) require.Contains(t, out, `"status":"error"`) diff --git a/internal/cli/review/binary_test.go b/internal/cli/review/binary_test.go index 69c27ba..eb106d4 100644 --- a/internal/cli/review/binary_test.go +++ b/internal/cli/review/binary_test.go @@ -7,12 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" + + "github.com/nnutter/timber/internal/testenv" ) func buildGitReview(t *testing.T) string { t.Helper() binary := filepath.Join(t.TempDir(), "git-review") - cmd := exec.CommandContext(t.Context(), "go", "build", "-o", binary, "./testdata/standalone") + cmd := exec.CommandContext(t.Context(), "go", testenv.BuildArgs(binary, "./testdata/standalone")...) out, err := cmd.CombinedOutput() require.NoError(t, err, "%s", out) return binary diff --git a/internal/cli/review/cli_test.go b/internal/cli/review/cli_test.go index 7cb5c4a..c035002 100644 --- a/internal/cli/review/cli_test.go +++ b/internal/cli/review/cli_test.go @@ -47,37 +47,48 @@ func execute(t *testing.T, dir string, args ...string) (string, string, error) { return output.String(), terminal.String(), err } -func TestCommandsShareStructuredResults(t *testing.T) { +func TestGitDispatchesReviewSubcommand(t *testing.T) { binary := buildGitReview(t) dir := featureRepo(t) t.Setenv("PATH", filepath.Dir(binary)+string(os.PathListSeparator)+os.Getenv("PATH")) - for _, tc := range []struct { - binary string - args []string - }{ - {binary: binary, args: []string{"status", "--needs-review", "--json"}}, - {binary: binary, args: []string{"--json", "status", "--needs-review"}}, - {binary: "git", args: []string{"review", "status", "--needs-review", "--json"}}, + out, terminal, err := executeBinary(t, "git", dir, "review", "status", "--needs-review", "--json") + require.NoError(t, err, "%s", terminal) + require.Empty(t, terminal) + checkNeedsReviewJSON(t, out) +} + +func checkNeedsReviewJSON(t *testing.T, out string) { + t.Helper() + require.Equal(t, 1, strings.Count(out, "\n")) + var result review.Result + require.NoError(t, json.Unmarshal([]byte(out), &result)) + require.Equal(t, "status", result.Command) + require.Len(t, result.Entries, 1) + require.Equal(t, "needs_review", result.Entries[0].Status) + require.Len(t, result.Entries[0].Stack.Commits[0], 40) + require.NotContains(t, out, "\x1b") +} + +func TestCommandsShareStructuredResults(t *testing.T) { + t.Parallel() + dir := featureRepo(t) + for _, args := range [][]string{ + {"status", "--needs-review", "--json"}, + {"--json", "status", "--needs-review"}, } { - out, terminal, err := executeBinary(t, tc.binary, dir, tc.args...) - require.NoError(t, err, "command: %s %v\nstdout: %s\nstderr: %s", tc.binary, tc.args, out, terminal) + out, terminal, err := execute(t, dir, args...) + require.NoError(t, err, "command: %v\nstdout: %s\nstderr: %s", args, out, terminal) require.Empty(t, terminal) - require.Equal(t, 1, strings.Count(out, "\n")) - var result review.Result - require.NoError(t, json.Unmarshal([]byte(out), &result)) - require.Equal(t, "status", result.Command) - require.Equal(t, "needs_review", result.Entries[0].Status) - require.Len(t, result.Entries[0].Stack.Commits[0], 40) - require.NotContains(t, out, "\x1b") + checkNeedsReviewJSON(t, out) } - out, terminal, err := executeBinary(t, binary, dir, "status", "--needs-review") + out, terminal, err := execute(t, dir, "status", "--needs-review") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, "Needs review") require.Contains(t, out, "Add feature") require.Contains(t, out, "COMMITS (inclusive)") require.NotContains(t, out, "Approved stacks are omitted from this summary.") - out, terminal, err = executeBinary(t, binary, dir, "confirm", "HEAD", "--json") + out, terminal, err = execute(t, dir, "confirm", "HEAD", "--json") require.NoError(t, err) require.Empty(t, terminal) var approved review.Result @@ -85,7 +96,7 @@ func TestCommandsShareStructuredResults(t *testing.T) { require.Equal(t, "approved", approved.Status) require.Equal(t, "approve", approved.Command) require.Equal(t, "user-command", approved.Entries[0].Attempt.ApprovalSource) - out, _, err = executeBinary(t, binary, dir, "status", "--needs-review", "--json") + out, _, err = execute(t, dir, "status", "--needs-review", "--json") require.NoError(t, err) var listed review.Result require.NoError(t, json.Unmarshal([]byte(out), &listed)) @@ -94,7 +105,7 @@ func TestCommandsShareStructuredResults(t *testing.T) { } func TestJSONErrorsIncludeArgumentAndGitFailures(t *testing.T) { - binary := buildGitReview(t) + t.Parallel() dir := featureRepo(t) git(t, dir, "branch", "--unset-upstream") for _, args := range [][]string{ @@ -104,10 +115,8 @@ func TestJSONErrorsIncludeArgumentAndGitFailures(t *testing.T) { {"not-a-command", "--json"}, {"--json", "status", "--needs-review", "--unknown"}, } { - out, terminal, err := executeBinary(t, binary, dir, args...) - var exit *exec.ExitError - require.ErrorAs(t, err, &exit) - require.Equal(t, 1, exit.ExitCode()) + out, terminal, err := execute(t, dir, args...) + require.Error(t, err) require.Empty(t, terminal) require.Equal(t, 1, strings.Count(out, "\n")) var result display.ErrorResult @@ -166,6 +175,7 @@ func TestReviewAliasResumesTheInterruptedAttempt(t *testing.T) { } func TestTerminalRenderingRetainsFeedbackAndRemovesControlSequences(t *testing.T) { + t.Parallel() dir := featureRepo(t) view, err := (review.Repository{Dir: dir}).Snapshot(t.Context()) require.NoError(t, err) @@ -202,10 +212,7 @@ func TestTuicrKeepsWorktreeLockedAfterGitReviewDies(t *testing.T) { t.Setenv("XDG_CACHE_HOME", t.TempDir()) t.Setenv("XDG_DATA_HOME", t.TempDir()) bin := t.TempDir() - binary := filepath.Join(bin, "review-test") - build := exec.CommandContext(t.Context(), "go", "build", "-o", binary, "./testdata/standalone") - buildOut, err := build.CombinedOutput() - require.NoError(t, err, "%s", buildOut) + binary := buildGitReview(t) started := filepath.Join(bin, "started") exitFile := filepath.Join(bin, "exit") t.Setenv("TEST_STARTED", started) @@ -226,7 +233,7 @@ func TestTuicrKeepsWorktreeLockedAfterGitReviewDies(t *testing.T) { return string(data) == "finished" }, 5*time.Second, 10*time.Millisecond) }() - require.Eventually(t, func() bool { _, err := os.Stat(started); return err == nil }, 5*time.Second, 10*time.Millisecond) + require.Eventually(t, func() bool { _, err := os.Stat(started); return err == nil }, 30*time.Second, 10*time.Millisecond, "tuicr did not start") require.NoError(t, cmd.Process.Kill()) require.Error(t, cmd.Wait()) out, _, err := execute(t, dir, "commits", "--json") @@ -237,6 +244,7 @@ func TestTuicrKeepsWorktreeLockedAfterGitReviewDies(t *testing.T) { } func TestHelpAndVersion(t *testing.T) { + t.Parallel() out, _, err := execute(t, t.TempDir(), "--help") require.NoError(t, err) require.Contains(t, out, "approve") diff --git a/internal/cli/review/commitmsg_test.go b/internal/cli/review/commitmsg_test.go index aef84bf..856593c 100644 --- a/internal/cli/review/commitmsg_test.go +++ b/internal/cli/review/commitmsg_test.go @@ -14,7 +14,6 @@ import ( // `timber hooks commit-msg` that earlier installed hooks still call. func TestCommitMsgMatchesGerritHook(t *testing.T) { - binary := buildGitReview(t) reference, err := filepath.Abs("testdata/commit-msg") require.NoError(t, err) t.Setenv("GIT_COMMITTER_DATE", "2001-02-03T04:05:06 +0000") @@ -59,7 +58,7 @@ func TestCommitMsgMatchesGerritHook(t *testing.T) { cmd := exec.CommandContext(t.Context(), "sh", reference, "reference message") cmd.Dir = dir refOut, refErr := cmd.CombinedOutput() - out, stderr, actualErr := executeBinary(t, binary, dir, "commit-msg", "actual message") + out, stderr, actualErr := execute(t, dir, "commit-msg", "actual message") require.Equal(t, refErr == nil, actualErr == nil, "reference: %s; actual: %s", refOut, stderr) require.Empty(t, out) expected, err := os.ReadFile(filepath.Join(dir, "reference message")) @@ -68,7 +67,7 @@ func TestCommitMsgMatchesGerritHook(t *testing.T) { require.NoError(t, err) require.Equal(t, string(expected), string(actual)) if actualErr == nil { - _, stderr, err = executeBinary(t, binary, dir, "commit-msg", "actual message") + _, stderr, err = execute(t, dir, "commit-msg", "actual message") require.NoError(t, err, "%s", stderr) again, err := os.ReadFile(filepath.Join(dir, "actual message")) require.NoError(t, err) diff --git a/internal/cli/review/commits/commits.go b/internal/cli/review/commits/commits.go index fb39eab..10d3dad 100644 --- a/internal/cli/review/commits/commits.go +++ b/internal/cli/review/commits/commits.go @@ -38,7 +38,7 @@ func (c *Command) runReview(ctx context.Context, options review.ReviewOptions, c if flag, err := cmd.Flags().GetBool("json"); err == nil { asJSON = flag } - reader, err := review.DefaultSavedReader() + reader, err := review.DefaultSavedReader(c.Service.Repository.Environment) if err != nil { return err } diff --git a/internal/cli/review/feedback_test.go b/internal/cli/review/feedback_test.go index 859fd26..6b15a7b 100644 --- a/internal/cli/review/feedback_test.go +++ b/internal/cli/review/feedback_test.go @@ -13,7 +13,7 @@ import ( ) func TestFeedbackReadsPersistedCurrentAndHistoricalNotes(t *testing.T) { - binary := buildGitReview(t) + t.Parallel() dir := featureRepo(t) repository := review.Repository{Dir: dir} original, err := repository.Snapshot(t.Context()) @@ -41,7 +41,7 @@ func TestFeedbackReadsPersistedCurrentAndHistoricalNotes(t *testing.T) { before, err := os.ReadFile(changed.Path) require.NoError(t, err) for _, args := range [][]string{{"feedback", "--json"}, {"--json", "feedback"}} { - out, terminal, err := executeBinary(t, binary, dir, args...) + out, terminal, err := execute(t, dir, args...) require.NoError(t, err) require.Empty(t, terminal) var result review.Result @@ -62,7 +62,7 @@ func TestFeedbackReadsPersistedCurrentAndHistoricalNotes(t *testing.T) { require.Equal(t, "Explain the change", *saved.SessionNotes) } } - out, terminal, err := executeBinary(t, binary, dir, "feedback") + out, terminal, err := execute(t, dir, "feedback") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, "Historical feedback: removed-stack") @@ -80,7 +80,7 @@ func TestFeedbackReadsPersistedCurrentAndHistoricalNotes(t *testing.T) { state.Attempts[3].Replacement = &changed.Stacks[0] return nil })) - out, _, err = executeBinary(t, binary, dir, "feedback", "--json") + out, _, err = execute(t, dir, "feedback", "--json") require.NoError(t, err) var result review.Result require.NoError(t, json.Unmarshal([]byte(out), &result)) @@ -93,6 +93,7 @@ func TestFeedbackReadsPersistedCurrentAndHistoricalNotes(t *testing.T) { } func TestFeedbackDoesNotLaunchOrRecoverReviews(t *testing.T) { + t.Parallel() dir := featureRepo(t) view, err := (review.Repository{Dir: dir}).Snapshot(t.Context()) require.NoError(t, err) diff --git a/internal/cli/review/files/files.go b/internal/cli/review/files/files.go index 3fd3026..d7f063b 100644 --- a/internal/cli/review/files/files.go +++ b/internal/cli/review/files/files.go @@ -33,7 +33,7 @@ func (c *Command) RunE(cmd *cobra.Command, args []string) error { if flag, err := cmd.Flags().GetBool("json"); err == nil { asJSON = flag } - reader, err := review.DefaultSavedReader() + reader, err := review.DefaultSavedReader(c.Service.Repository.Environment) if err != nil { return err } diff --git a/internal/cli/review/files_test.go b/internal/cli/review/files_test.go index 3fb4085..7fd0d24 100644 --- a/internal/cli/review/files_test.go +++ b/internal/cli/review/files_test.go @@ -4,7 +4,6 @@ import ( "encoding/json/v2" "os" "path/filepath" - "strings" "testing" "github.com/stretchr/testify/require" @@ -42,6 +41,7 @@ func TestFilesCommandArgMapping(t *testing.T) { require.Equal(t, 1, result.Version) require.Equal(t, "files", result.Command) require.Equal(t, "cancelled", result.Status) + require.Nil(t, result.Review) launch, err := os.ReadFile(log) require.NoError(t, err) require.Equal(t, tc.wantArgs+"\n", string(launch)) @@ -78,26 +78,6 @@ func TestFilesUpstreamAndEmptyRange(t *testing.T) { require.ErrorIs(t, err, os.ErrNotExist) } -func TestFilesCommandDistinguishesCommits(t *testing.T) { - dir := featureRepo(t) - t.Setenv("XDG_CACHE_HOME", t.TempDir()) - t.Setenv("XDG_DATA_HOME", t.TempDir()) - bin := t.TempDir() - require.NoError(t, os.WriteFile(filepath.Join(bin, "tuicr"), []byte("#!/bin/sh\nexit 0\n"), 0o700)) - t.Setenv("PATH", bin+string(os.PathListSeparator)+os.Getenv("PATH")) - commitsOut, _, err := execute(t, dir, "commits", "--json") - require.NoError(t, err) - var commits review.Result - require.NoError(t, json.Unmarshal([]byte(commitsOut), &commits)) - require.Equal(t, "commits", commits.Command) - filesOut, _, err := execute(t, dir, "files", "--json") - require.NoError(t, err) - var files review.FilesResult - require.NoError(t, json.Unmarshal([]byte(filesOut), &files)) - require.Equal(t, "files", files.Command) - require.NotEqual(t, commits.Command, files.Command) -} - func TestFilesCommandTerminalAndErrors(t *testing.T) { dir := featureRepo(t) t.Setenv("XDG_CACHE_HOME", t.TempDir()) @@ -151,16 +131,10 @@ func TestFilesHoldsWorktreeLock(t *testing.T) { started := filepath.Join(bin, "started") require.NoError(t, os.WriteFile(filepath.Join(bin, "tuicr"), []byte("#!/bin/sh\nprintf started > \""+started+"\"\nsleep 3\n"), 0o700)) t.Setenv("PATH", bin+string(os.PathListSeparator)+os.Getenv("PATH")) - // Launch files in background via binary to check lock held during TUI. - binary := buildGitReview(t) - t.Setenv("PATH", filepath.Dir(binary)+string(os.PathListSeparator)+os.Getenv("PATH")) - done := make(chan struct{}) + done := make(chan error, 1) go func() { - defer close(done) - out, _, _ := executeBinary(t, binary, dir, "files", "--json") - if strings.Contains(out, `"status":"cancelled"`) { - return - } + _, _, err := execute(t, dir, "files", "--json") + done <- err }() require.Eventually(t, func() bool { _, err := os.Stat(started) @@ -168,8 +142,8 @@ func TestFilesHoldsWorktreeLock(t *testing.T) { }, 5_000_000_000, 10_000_000) // While files holds the repository-wide lock, status --is-reviewing // reports true, just as it does during a commits review. - out, _, err := executeBinary(t, binary, dir, "status", "--is-reviewing", "--json") + out, _, err := execute(t, dir, "status", "--is-reviewing", "--json") require.NoError(t, err) require.Contains(t, out, `"is_reviewing":true`) - <-done + require.NoError(t, <-done) } diff --git a/internal/cli/review/log_test.go b/internal/cli/review/log_test.go index 4783201..d5e725f 100644 --- a/internal/cli/review/log_test.go +++ b/internal/cli/review/log_test.go @@ -134,7 +134,7 @@ func TestLogHunkPager(t *testing.T) { t.Setenv("HUNK_OUTPUT", capture) t.Setenv("TERM", "xterm") - out, terminal, err := executeBinary(t, binary, dir, "log", "--hunk") + out, terminal, err := execute(t, dir, "log", "--hunk") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, "+example content\n") diff --git a/internal/cli/review/reset/reset.go b/internal/cli/review/reset/reset.go index e3c83aa..a1e431c 100644 --- a/internal/cli/review/reset/reset.go +++ b/internal/cli/review/reset/reset.go @@ -26,7 +26,7 @@ func (c *Command) RunE(cmd *cobra.Command, args []string) error { if len(args) > 0 { selector = args[0] } - reader, err := review.DefaultSavedReader() + reader, err := review.DefaultSavedReader(c.Service.Repository.Environment) if err != nil { return err } diff --git a/internal/cli/review/status_test.go b/internal/cli/review/status_test.go index 4bb469c..0c84766 100644 --- a/internal/cli/review/status_test.go +++ b/internal/cli/review/status_test.go @@ -5,7 +5,6 @@ import ( "encoding/json/v2" "fmt" "os" - "os/exec" "strings" "testing" @@ -17,7 +16,7 @@ import ( ) func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { - binary := buildGitReview(t) + t.Parallel() dir := featureRepo(t) git(t, dir, "commit", "--allow-empty", "-m", "fixup! Add feature") for i, subject := range []string{"Active", "Feedback", "Partial", "Approved"} { @@ -41,7 +40,7 @@ func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { want := []review.StateCount{{State: "needs_review", Count: 3}, {State: "reviewing", Count: 1}, {State: "feedback"}, {State: "incomplete", Count: 1}, {State: "auto_reviewed"}, {State: "approved", Count: 2}} entryStates := []string{"needs_review", "reviewing", "needs_review", "incomplete", "approved"} for _, args := range [][]string{{"status", "--json"}, {"--json", "status"}} { - out, terminal, err := executeBinary(t, binary, dir, args...) + out, terminal, err := execute(t, dir, args...) require.NoError(t, err) require.Empty(t, terminal) var result review.Result @@ -61,7 +60,7 @@ func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { require.Len(t, result.Active, 1) require.Equal(t, "reviewing", result.Active[0].ID) } - out, terminal, err := executeBinary(t, binary, dir, "status") + out, terminal, err := execute(t, dir, "status") require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, out, "COMMITS (inclusive)") @@ -75,14 +74,14 @@ func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { require.Contains(t, out, stack.Subject) require.Contains(t, out, reviewdisplay.StatusLabel(entryStates[i])) } - filtered, terminal, err := executeBinary(t, binary, dir, "status", "--needs-review") + filtered, terminal, err := execute(t, dir, "status", "--needs-review") require.NoError(t, err) require.Empty(t, terminal) for _, stack := range view.Stacks[:4] { require.Contains(t, filtered, reviewdisplay.ShortStack(stack)) } require.NotContains(t, filtered, reviewdisplay.ShortStack(view.Stacks[4])) - filtered, _, err = executeBinary(t, binary, dir, "status", "--needs-review", "--json") + filtered, _, err = execute(t, dir, "status", "--needs-review", "--json") require.NoError(t, err) var result review.Result require.NoError(t, json.Unmarshal([]byte(filtered), &result)) @@ -101,13 +100,13 @@ func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { // A changed stack loses approval, and removed stacks contribute nothing. git(t, dir, "commit", "--allow-empty", "-m", "fixup! Approved") - out, _, err = executeBinary(t, binary, dir, "status", "--json") + out, _, err = execute(t, dir, "status", "--json") require.NoError(t, err) require.NoError(t, json.Unmarshal([]byte(out), &result)) require.Equal(t, []review.StateCount{{State: "needs_review", Count: 6}, {State: "reviewing", Count: 1}, {State: "feedback"}, {State: "incomplete", Count: 1}, {State: "auto_reviewed"}, {State: "approved", Count: 0}}, result.Summary) - assertStatusVerbosity(t, binary, dir, out) + assertStatusVerbosity(t, dir, out) git(t, dir, "reset", "--hard", "main") - out, _, err = executeBinary(t, binary, dir, "status", "--json") + out, _, err = execute(t, dir, "status", "--json") require.NoError(t, err) require.NoError(t, json.Unmarshal([]byte(out), &result)) require.Equal(t, []review.StateCount{{State: "needs_review"}, {State: "reviewing"}, {State: "feedback"}, {State: "incomplete"}, {State: "auto_reviewed"}, {State: "approved"}}, result.Summary) @@ -118,14 +117,14 @@ func TestStatusCountsCurrentCommitsInStateOrder(t *testing.T) { require.Empty(t, result.Active) } -func assertStatusVerbosity(t *testing.T, binary, dir, out string) { +func assertStatusVerbosity(t *testing.T, dir, out string) { t.Helper() for _, flag := range []string{"", "-v", "--verbose"} { args := []string{"status"} if flag != "" { args = append(args, flag) } - text, terminal, err := executeBinary(t, binary, dir, args...) + text, terminal, err := execute(t, dir, args...) require.NoError(t, err) require.Empty(t, terminal) require.Contains(t, text, "Active attempt: reviewing") @@ -138,13 +137,14 @@ func assertStatusVerbosity(t *testing.T, binary, dir, out string) { require.Contains(t, text, "Saved review details") require.Less(t, strings.LastIndex(text, "Saved review details"), strings.Index(text, "COMMITS (inclusive)")) } - jsonOut, _, err := executeBinary(t, binary, dir, append(args, "--json")...) + jsonOut, _, err := execute(t, dir, append(args, "--json")...) require.NoError(t, err) require.JSONEq(t, out, jsonOut) } } func TestStatusWithoutReviewHistory(t *testing.T) { + t.Parallel() dir := featureRepo(t) view, err := (review.Repository{Dir: dir}).Snapshot(t.Context()) require.NoError(t, err) @@ -177,6 +177,7 @@ func TestStatusWithoutReviewHistory(t *testing.T) { } func TestMissingChangeIDWarning(t *testing.T) { + t.Parallel() dir := featureRepo(t) git(t, dir, "commit", "--allow-empty", "-m", "Missing ID") git(t, dir, "commit", "--allow-empty", "-m", "fixup! Missing ID") @@ -193,6 +194,7 @@ func TestMissingChangeIDWarning(t *testing.T) { } func TestMissingChangeIDWarningSkipsApprovedStacks(t *testing.T) { + t.Parallel() dir := featureRepo(t) git(t, dir, "commit", "--allow-empty", "-m", "Missing ID") _, terminal, err := execute(t, dir, "approve", "HEAD") @@ -208,6 +210,7 @@ func TestMissingChangeIDWarningSkipsApprovedStacks(t *testing.T) { } func TestStatusDebugLogsStayOffJSON(t *testing.T) { + t.Parallel() dir := featureRepo(t) out, terminal, err := execute(t, dir, "status", "--json", "--debug") require.NoError(t, err) @@ -219,15 +222,13 @@ func TestStatusDebugLogsStayOffJSON(t *testing.T) { } func TestStatusOutsideGitRepository(t *testing.T) { - binary := buildGitReview(t) + t.Parallel() dir := t.TempDir() const message = "timber review must be used from inside a Git repository" for _, args := range [][]string{{"status"}, {"status", "--json"}} { t.Run(args[len(args)-1], func(t *testing.T) { - out, terminal, err := executeBinary(t, binary, dir, args...) - var exit *exec.ExitError - require.ErrorAs(t, err, &exit) - require.Equal(t, 1, exit.ExitCode()) + out, terminal, err := execute(t, dir, args...) + require.Error(t, err) if len(args) == 2 { require.Empty(t, terminal) var failed display.ErrorResult @@ -247,6 +248,7 @@ func TestStatusOutsideGitRepository(t *testing.T) { } func TestStatusJSONErrors(t *testing.T) { + t.Parallel() dir := featureRepo(t) for _, args := range [][]string{{"status", "extra", "--json"}, {"status", "--unknown", "--json"}} { out, terminal, err := execute(t, dir, args...) diff --git a/internal/cli/test_helpers_test.go b/internal/cli/test_helpers_test.go index 6e5eaac..1a92495 100644 --- a/internal/cli/test_helpers_test.go +++ b/internal/cli/test_helpers_test.go @@ -89,6 +89,7 @@ func testRuntimeForHome(home, directory string) timber.Runtime { "XDG_DATA_HOME="+dataHome, "XDG_CONFIG_HOME="+configHome, "TIMBER_WORKTREE_ROOT="+worktreeRoot, + "GOCOVERDIR="+os.Getenv("GOCOVERDIR"), // Fixtures can live inside this checkout. Do not discover its // repository when the command runs outside a fixture worktree. "GIT_CEILING_DIRECTORIES="+filepath.Dir(home), diff --git a/internal/testenv/build.go b/internal/testenv/build.go new file mode 100644 index 0000000..02eb41c --- /dev/null +++ b/internal/testenv/build.go @@ -0,0 +1,13 @@ +package testenv + +import "os" + +// BuildArgs builds a test subprocess. Use an instrumented build only when the +// caller is collecting subprocess counters in GOCOVERDIR. +func BuildArgs(output, pkg string) []string { + args := []string{"build", "-o", output} + if os.Getenv("GOCOVERDIR") != "" { + args = append(args, "-cover", "-covermode=atomic", "-coverpkg=./...") + } + return append(args, pkg) +} diff --git a/internal/timber/review/approve_all_test.go b/internal/timber/review/approve_all_test.go index 5a7dd2c..4be26e8 100644 --- a/internal/timber/review/approve_all_test.go +++ b/internal/timber/review/approve_all_test.go @@ -7,6 +7,7 @@ import ( ) func TestApproveAllApprovesEveryStack(t *testing.T) { + t.Parallel() r := testRepo(t) for _, subject := range []string{"First", "Second", "Third"} { gitTest(t, r.Dir, "commit", "--allow-empty", "-m", subject) @@ -25,6 +26,7 @@ func TestApproveAllApprovesEveryStack(t *testing.T) { } func TestApproveAllBlockedByFeedbackOnAnyStack(t *testing.T) { + t.Parallel() r := testRepo(t) for _, subject := range []string{"First", "Second", "Third"} { gitTest(t, r.Dir, "commit", "--allow-empty", "-m", subject) diff --git a/internal/timber/review/auto_context_test.go b/internal/timber/review/auto_context_test.go index 8f8c9d4..89b0329 100644 --- a/internal/timber/review/auto_context_test.go +++ b/internal/timber/review/auto_context_test.go @@ -10,6 +10,7 @@ import ( ) func TestAutoContextReadsOnlyCapturedObjects(t *testing.T) { + t.Parallel() r := testRepo(t) file := filepath.Join(r.Dir, "code.go") require.NoError(t, os.WriteFile(file, []byte("package example\nconst Old = 1\n"), 0o600)) @@ -36,6 +37,7 @@ func TestAutoContextReadsOnlyCapturedObjects(t *testing.T) { } func TestAutoContextRestrictsPathsSearchesAndOutput(t *testing.T) { + t.Parallel() r := testRepo(t) for _, name := range []string{"normal.go", ".env", "nested/credentials/data", "nested/.env.local"} { file := filepath.Join(r.Dir, name) @@ -67,6 +69,7 @@ func TestAutoContextRestrictsPathsSearchesAndOutput(t *testing.T) { } func TestAutoContextReportsGitFailures(t *testing.T) { + t.Parallel() r := testRepo(t) _, err := r.autoGit(t.Context(), autoContextLimit, "cat-file", "blob", "missing:missing") require.ErrorContains(t, err, "read automatic review context") diff --git a/internal/timber/review/auto_state_test.go b/internal/timber/review/auto_state_test.go index e9fb59f..7dad824 100644 --- a/internal/timber/review/auto_state_test.go +++ b/internal/timber/review/auto_state_test.go @@ -9,6 +9,7 @@ import ( ) func TestAutomaticReviewDoesNotTransferToRewrittenCommits(t *testing.T) { + t.Parallel() r := testRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte("one\n"), 0o600)) gitTest(t, r.Dir, "add", "value") @@ -37,6 +38,7 @@ func TestAutomaticReviewDoesNotTransferToRewrittenCommits(t *testing.T) { // A model result resets when the stack content changes, and a rewritten message // is content that the model read. func TestAutomaticReviewResetsWhenContentOrMessageChanges(t *testing.T) { + t.Parallel() for _, tc := range []struct { name string rewrite func(t *testing.T, dir string) @@ -85,6 +87,7 @@ func TestAutomaticReviewResetsWhenContentOrMessageChanges(t *testing.T) { } func TestAutomaticReviewValidation(t *testing.T) { + t.Parallel() r := testRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte("one\n"), 0o600)) gitTest(t, r.Dir, "add", "value") @@ -124,6 +127,7 @@ func TestAutomaticReviewValidation(t *testing.T) { } func TestAutomaticReviewUnderAnotherPolicyDoesNotApply(t *testing.T) { + t.Parallel() r := testRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte("one\n"), 0o600)) gitTest(t, r.Dir, "add", "value") diff --git a/internal/timber/review/auto_test.go b/internal/timber/review/auto_test.go index 24185c7..55365c3 100644 --- a/internal/timber/review/auto_test.go +++ b/internal/timber/review/auto_test.go @@ -35,6 +35,7 @@ func autoRepo(t *testing.T) Repository { } func TestAutoDryRunEvaluatesCompleteStackWithoutRecordingApproval(t *testing.T) { + t.Parallel() r := autoRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte("two\n"), 0o600)) gitTest(t, r.Dir, "commit", "-am", "fixup! Refactor: Extract constant") @@ -68,6 +69,7 @@ func TestAutoDryRunEvaluatesCompleteStackWithoutRecordingApproval(t *testing.T) } func TestAutoRecordsModelEvidenceAndSkipsApprovedStack(t *testing.T) { + t.Parallel() r := autoRepo(t) service := Service{Repository: r} result, err := service.Auto(t.Context(), approvingEvaluator(), AutoOptions{}) @@ -90,6 +92,7 @@ func TestAutoRecordsModelEvidenceAndSkipsApprovedStack(t *testing.T) { } func TestAutoFailsClosedDuringEvaluation(t *testing.T) { + t.Parallel() cases := []struct { name string run func(*testing.T, Repository, context.Context) (autoreview.Verdict, error) @@ -139,6 +142,7 @@ func TestAutoFailsClosedDuringEvaluation(t *testing.T) { } func TestAutoResumesAfterALaterStackFails(t *testing.T) { + t.Parallel() r := autoRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Refactor: Second change") service := Service{Repository: r} @@ -171,6 +175,7 @@ func TestAutoResumesAfterALaterStackFails(t *testing.T) { } func TestAutoSkipsIneligibleAndPreviouslyReviewedStacks(t *testing.T) { + t.Parallel() cases := []struct { name string subject string @@ -209,6 +214,7 @@ func TestAutoSkipsIneligibleAndPreviouslyReviewedStacks(t *testing.T) { } func TestAutoAbstentionRecordsResultWithoutApproving(t *testing.T) { + t.Parallel() for _, decision := range []string{"needs-human-review", "not-eligible"} { t.Run(decision, func(t *testing.T) { r := autoRepo(t) @@ -239,6 +245,7 @@ func abstainingEvaluator(decision string) autoreview.Evaluator { } func TestAutoSkipsRecordedResultUntilContentChanges(t *testing.T) { + t.Parallel() r := autoRepo(t) service := Service{Repository: r} _, err := service.Auto(t.Context(), abstainingEvaluator("needs-human-review"), AutoOptions{}) @@ -263,6 +270,7 @@ func TestAutoSkipsRecordedResultUntilContentChanges(t *testing.T) { } func TestAutoRejectsOversizedDiffWithoutCallingProvider(t *testing.T) { + t.Parallel() r := autoRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte(strings.Repeat("a", autoreview.MaxInputBytes+1)), 0o600)) gitTest(t, r.Dir, "commit", "-am", "fixup! Refactor: Extract constant") @@ -274,6 +282,7 @@ func TestAutoRejectsOversizedDiffWithoutCallingProvider(t *testing.T) { } func TestAutoReportsOnlyProviderRequests(t *testing.T) { + t.Parallel() r := autoRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Add behavior") view, err := r.Snapshot(t.Context()) @@ -291,6 +300,7 @@ func TestAutoReportsOnlyProviderRequests(t *testing.T) { } func TestAutoSkipsBinaryChangesBeforeAnyRequest(t *testing.T) { + t.Parallel() r := autoRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "blob.bin"), []byte{0, 1, 2}, 0o600)) gitTest(t, r.Dir, "add", "blob.bin") @@ -304,6 +314,7 @@ func TestAutoSkipsBinaryChangesBeforeAnyRequest(t *testing.T) { } func TestAutoRequiresNoActiveReview(t *testing.T) { + t.Parallel() r := autoRepo(t) view, err := r.Snapshot(t.Context()) require.NoError(t, err) diff --git a/internal/timber/review/bounds_test.go b/internal/timber/review/bounds_test.go index e29063c..126f5b4 100644 --- a/internal/timber/review/bounds_test.go +++ b/internal/timber/review/bounds_test.go @@ -9,8 +9,10 @@ import ( ) func TestReviewSelectsWithinInclusiveBounds(t *testing.T) { + t.Parallel() for _, bounds := range []string{"start", "end", "both"} { t.Run(bounds, func(t *testing.T) { + t.Parallel() reviewer, _, store := testReviewer(t) r := reviewer.Service.Repository gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Second") @@ -38,8 +40,7 @@ func TestReviewSelectsWithinInclusiveBounds(t *testing.T) { scope.Repo = path savedFixture(t, scope, store, true) log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - fakeTuicr(t, `printf '%s\n' "$@" >> "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$@" >> "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) result, err := reviewer.Review(t.Context(), options) require.NoError(t, err) if bounds == "start" { @@ -67,8 +68,10 @@ func TestReviewSelectsWithinInclusiveBounds(t *testing.T) { } func TestBoundedReviewContinuesUntilApprovalOrUserInput(t *testing.T) { + t.Parallel() for _, outcome := range []string{"approved", "feedback", "incomplete", "cancelled", "error"} { t.Run(outcome, func(t *testing.T) { + t.Parallel() reviewer, _, firstStore := testReviewer(t) r := reviewer.Service.Repository gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Second") @@ -102,13 +105,12 @@ func TestBoundedReviewContinuesUntilApprovalOrUserInput(t *testing.T) { return nil })) log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - t.Setenv("TEST_FAIL_TIP", "") + var failTip string if outcome == "error" { - t.Setenv("TEST_FAIL_TIP", second.Tip) + failTip = second.Tip } - fakeTuicr(t, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG" -if [ "$(git rev-parse HEAD)" = "$TEST_FAIL_TIP" ]; then exit 1; fi`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG" +if [ "$(git rev-parse HEAD)" = "$TEST_FAIL_TIP" ]; then exit 1; fi`, "TEST_LAUNCH_LOG="+log, "TEST_FAIL_TIP="+failTip) result, err := reviewer.Review(t.Context(), ReviewOptions{Start: first.Tip, End: second.Tip, Session: "fixture-session"}) if outcome == "error" { require.ErrorContains(t, err, "tuicr interrupted") @@ -137,6 +139,7 @@ if [ "$(git rev-parse HEAD)" = "$TEST_FAIL_TIP" ]; then exit 1; fi`) } func TestBoundedReviewRetainsFeedbackAndContinuesToLaterStacks(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository gitTest(t, r.Dir, "commit", "--allow-empty", "--fixup=HEAD") @@ -160,8 +163,7 @@ func TestBoundedReviewRetainsFeedbackAndContinuesToLaterStacks(t *testing.T) { wantLaunch += stack.Base + ".." + stack.Tip + "\n" } log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - fakeTuicr(t, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) options := ReviewOptions{Start: view.Stacks[0].Tip, End: view.Stacks[2].Tip} result, err := reviewer.Review(t.Context(), options) require.NoError(t, err) @@ -192,6 +194,7 @@ func TestBoundedReviewRetainsFeedbackAndContinuesToLaterStacks(t *testing.T) { } func TestReviewRejectsInvalidBoundsWithoutStateChanges(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Second") @@ -215,6 +218,7 @@ func TestReviewRejectsInvalidBoundsWithoutStateChanges(t *testing.T) { } func TestBoundedReviewRetainsDeferredAndActiveAttempts(t *testing.T) { + t.Parallel() reviewer, view, store := testReviewer(t) r := reviewer.Service.Repository first := view.Stacks[0] @@ -242,7 +246,7 @@ func TestBoundedReviewRetainsDeferredAndActiveAttempts(t *testing.T) { scope := first scope.Repo = path savedFixture(t, scope, store, true) - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") // The active attempt resumes without asking, and the deferred stack stays. result, err = reviewer.Review(t.Context(), options) require.NoError(t, err) diff --git a/internal/timber/review/carry_test.go b/internal/timber/review/carry_test.go index 02e7dab..8cc60d5 100644 --- a/internal/timber/review/carry_test.go +++ b/internal/timber/review/carry_test.go @@ -87,6 +87,7 @@ func carryRepository(t *testing.T) (Reviewer, Snapshot) { } func TestCarrySavedReviewKeepsMarksAcrossRewrite(t *testing.T) { + t.Parallel() for _, tc := range []struct { name string message string @@ -154,6 +155,7 @@ func TestCarrySavedReviewKeepsMarksAcrossRewrite(t *testing.T) { } func TestCarrySavedReviewLeavesAMatchingRangeAlone(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() reviewer.Reader = SavedReader{Stores: []string{store}} @@ -176,12 +178,13 @@ func TestCarrySavedReviewLeavesAMatchingRangeAlone(t *testing.T) { // A review that a rewrite moved records the carried progress, so the result and // the session that tuicr shows describe the same work. func TestReviewRecordsCarriedProgress(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() reviewer.Reader = SavedReader{Stores: []string{store}} carryFixture(t, reviewer, view, store) gitTest(t, reviewer.Service.Repository.Dir, "commit", "--amend", "--allow-empty", "--date", "2026-01-01T00:00:00Z", "-m", "Feature reworded") - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") result, err := reviewer.Review(t.Context(), ReviewOptions{}) require.NoError(t, err) @@ -198,6 +201,7 @@ func TestReviewRecordsCarriedProgress(t *testing.T) { // the path that the reader reports differs from the path that names the store. // The move must still find the index entry. func TestCarrySavedReviewThroughAliasedStore(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() alias := filepath.Join(t.TempDir(), "alias") @@ -220,6 +224,7 @@ func TestCarrySavedReviewThroughAliasedStore(t *testing.T) { // the session stores. A carried session must store them the way that tuicr // stores them, or tuicr names the session under another name. func TestCarrySavedReviewStoresTheRangeTheWayTuicrStoresIt(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() reviewer.Reader = SavedReader{Stores: []string{store}} @@ -251,6 +256,7 @@ func TestCarrySavedReviewStoresTheRangeTheWayTuicrStoresIt(t *testing.T) { // A range of more than one commit carries, because tuicr stores the range // from the newest commit to the oldest. func TestCarrySavedReviewCarriesARangeOfSeveralCommits(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) dir := reviewer.Service.Repository.Dir gitTest(t, dir, "reset", "--hard", "main") @@ -292,6 +298,7 @@ func TestCarrySavedReviewCarriesARangeOfSeveralCommits(t *testing.T) { // keep the name that tuicr gives a session, because tuicr finds a session by // that name and writes a second session for a range that it cannot find. func TestReviewContinuesAfterASquashedCommit(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() reviewer.Reader = SavedReader{Stores: []string{store}} @@ -313,12 +320,13 @@ func TestReviewContinuesAfterASquashedCommit(t *testing.T) { // session that tuicr wrote. The review continues with the session that the // index recorded last, because that is the session that tuicr reopens. func TestReviewContinuesWithTheLastRecordedSession(t *testing.T) { + t.Parallel() reviewer, view := carryRepository(t) store := t.TempDir() reviewer.Reader = SavedReader{Stores: []string{store}} carryFixture(t, reviewer, view, store) addSecondSession(t, store, view, "2026-02-02T00:00:00Z") - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") result, err := reviewer.Review(t.Context(), ReviewOptions{}) require.NoError(t, err, "the review does not stop on a range with two sessions") diff --git a/internal/timber/review/file_feedback_test.go b/internal/timber/review/file_feedback_test.go index 4229b47..d4faac5 100644 --- a/internal/timber/review/file_feedback_test.go +++ b/internal/timber/review/file_feedback_test.go @@ -9,6 +9,7 @@ import ( ) func TestFileFeedbackDiscoversNotesWithoutChangingSessions(t *testing.T) { + t.Parallel() r := testRepo(t) store := t.TempDir() path := filepath.Join(store, "sessions/0123456789abcdef.json") diff --git a/internal/timber/review/files.go b/internal/timber/review/files.go index dabd875..925e926 100644 --- a/internal/timber/review/files.go +++ b/internal/timber/review/files.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "os" - "os/exec" "path/filepath" "strings" ) @@ -133,7 +132,10 @@ func (r FileReviewer) Review(ctx context.Context, options FilesOptions) (FilesRe } func (r FileReviewer) launch(ctx context.Context, args []string, lock *os.File) error { - cmd := exec.CommandContext(ctx, "tuicr", args...) + cmd, err := r.Service.Repository.tuicr(ctx, args...) + if err != nil { + return fmt.Errorf("tuicr interrupted or failed; use timber review files to retry: %w", err) + } cmd.Dir = r.Service.Repository.Dir cmd.Stdin = r.Input if wrapped, ok := r.Input.(interface{ UnwrapReader() io.Reader }); ok { diff --git a/internal/timber/review/files_test.go b/internal/timber/review/files_test.go index 8bcb70a..87d3217 100644 --- a/internal/timber/review/files_test.go +++ b/internal/timber/review/files_test.go @@ -29,6 +29,7 @@ func fileFixture(t *testing.T, repo, diffSource, base string, store string, revi } func TestReadFilePristineAndWorkingTree(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") repo, err := r.git(t.Context(), "rev-parse", "--show-toplevel") @@ -59,6 +60,7 @@ func TestReadFilePristineAndWorkingTree(t *testing.T) { } func TestReadFileOutcomes(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") repo, err := r.git(t.Context(), "rev-parse", "--show-toplevel") @@ -91,6 +93,7 @@ func TestReadFileOutcomes(t *testing.T) { } func TestReadFileChoosesTheLastRecordedSession(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") repo, err := r.git(t.Context(), "rev-parse", "--show-toplevel") @@ -120,6 +123,7 @@ func TestReadFileChoosesTheLastRecordedSession(t *testing.T) { } func TestFilesReviewArgMappingAndLock(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "file.txt"), []byte("File to review\n"), 0o600)) @@ -141,8 +145,7 @@ func TestFilesReviewArgMappingAndLock(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - fakeTuicr(t, `printf '%s\n' "$@" > "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$@" > "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) fileStore := t.TempDir() fileFixture(t, repo, tc.diffSource, tc.base, fileStore, true, "sessions/0123456789abcdef.json") fr := FileReviewer{Service: reviewer.Service, Reader: SavedReader{Stores: []string{fileStore}}, Input: strings.NewReader(""), Terminal: io.Discard} @@ -158,15 +161,3 @@ func TestFilesReviewArgMappingAndLock(t *testing.T) { }) } } - -func TestFilesReviewCancelledWithoutSession(t *testing.T) { - reviewer, _, _ := testReviewer(t) - fakeTuicr(t, "exit 0") - store := t.TempDir() - fr := FileReviewer{Service: reviewer.Service, Reader: SavedReader{Stores: []string{store}}, Input: strings.NewReader(""), Terminal: io.Discard} - result, err := fr.Review(t.Context(), FilesOptions{}) - require.NoError(t, err) - require.Equal(t, "files", result.Command) - require.Equal(t, "cancelled", result.Status) - require.Nil(t, result.Review) -} diff --git a/internal/timber/review/git.go b/internal/timber/review/git.go index e5cdf79..d184696 100644 --- a/internal/timber/review/git.go +++ b/internal/timber/review/git.go @@ -378,6 +378,40 @@ func (r Repository) stackView(ctx context.Context) (Snapshot, string, error) { return view, repo, nil } +// tuicr runs with the same environment as the repository's Git commands. +func (r Repository) tuicr(ctx context.Context, args ...string) (*exec.Cmd, error) { + name := "tuicr" + if r.Environment != nil { + var err error + name, err = lookPathInEnvironment(name, r.Environment) + if err != nil { + return nil, err + } + } + cmd := exec.CommandContext(ctx, name, args...) + cmd.Env = r.Environment + return cmd, nil +} + +func lookPathInEnvironment(name string, environment []string) (string, error) { + for dir := range strings.SplitSeq(environmentValue(environment, "PATH"), string(os.PathListSeparator)) { + if dir == "" { + dir = "." + } + // Joining can drop a leading "./"; keep a separator so LookPath + // checks this candidate rather than searching the process PATH. + path, err := exec.LookPath(dir + string(os.PathSeparator) + name) + if err != nil { + continue + } + if !filepath.IsAbs(path) { + return "", &exec.Error{Name: path, Err: exec.ErrDot} + } + return path, nil + } + return "", &exec.Error{Name: name, Err: exec.ErrNotFound} +} + func stacks(repo, base string, history []historyCommit) ([]Stack, error) { stacks := []Stack{} if len(history) == 0 { diff --git a/internal/timber/review/git_test.go b/internal/timber/review/git_test.go index 45f34c0..337233e 100644 --- a/internal/timber/review/git_test.go +++ b/internal/timber/review/git_test.go @@ -25,17 +25,17 @@ func testRepo(t *testing.T) Repository { t.Helper() dir, err := filepath.EvalSymlinks(t.TempDir()) require.NoError(t, err) - t.Setenv("HOME", dir) gitTest(t, dir, "init", "-b", "main") gitTest(t, dir, "config", "user.name", "Test") gitTest(t, dir, "config", "user.email", "test@example.com") gitTest(t, dir, "commit", "--allow-empty", "-m", "Base") gitTest(t, dir, "checkout", "-b", "feature") gitTest(t, dir, "branch", "--set-upstream-to=main") - return Repository{Dir: dir, Environment: os.Environ()} + return Repository{Dir: dir, Environment: append(os.Environ(), "HOME="+dir, "XDG_DATA_HOME=")} } func TestSnapshot(t *testing.T) { + t.Parallel() r := testRepo(t) id := "I" + strings.Repeat("a", 40) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Add feature\n\nChange-Id: "+id) @@ -76,6 +76,7 @@ func TestSnapshotGroupsNativeFixupsTargetingStackTip(t *testing.T) { } func TestSnapshotTreatsOrphanFeedbackAsNormalCommit(t *testing.T) { + t.Parallel() cases := []struct { name string subjects []string @@ -112,6 +113,7 @@ func TestSnapshotTreatsOrphanFeedbackAsNormalCommit(t *testing.T) { } func TestSnapshotRejectsUnsafeHistory(t *testing.T) { + t.Parallel() cases := []struct { name string setup func(*testing.T, Repository) diff --git a/internal/timber/review/patch_cache_test.go b/internal/timber/review/patch_cache_test.go index 58a305b..936e35e 100644 --- a/internal/timber/review/patch_cache_test.go +++ b/internal/timber/review/patch_cache_test.go @@ -13,6 +13,7 @@ import ( ) func TestSnapshotPatchCache(t *testing.T) { + t.Parallel() r := testRepo(t) var logs bytes.Buffer r.Logger = log.NewWithOptions(&logs, log.Options{Level: log.DebugLevel}) @@ -47,6 +48,7 @@ func TestSnapshotPatchCache(t *testing.T) { } func TestSnapshotPatchCacheTracksDiffInputs(t *testing.T) { + t.Parallel() for _, source := range []string{"worktree", "info", "global", "driver-config"} { t.Run(source, func(t *testing.T) { r := testRepo(t) @@ -82,6 +84,7 @@ func TestSnapshotPatchCacheTracksDiffInputs(t *testing.T) { } func TestSnapshotRefreshesPatchForAttributesOnOneOfSeveralStacks(t *testing.T) { + t.Parallel() r := testRepo(t) for _, path := range []string{"first file", "second"} { require.NoError(t, os.WriteFile(filepath.Join(r.Dir, path), []byte("text\n"), 0o600)) @@ -103,6 +106,7 @@ func TestSnapshotRefreshesPatchForAttributesOnOneOfSeveralStacks(t *testing.T) { } func TestSnapshotPatchCacheFailureIsDisposable(t *testing.T) { + t.Parallel() for _, failure := range []string{"corrupt", "unavailable"} { t.Run(failure, func(t *testing.T) { r := testRepo(t) diff --git a/internal/timber/review/patch_status_test.go b/internal/timber/review/patch_status_test.go index 916e3d6..89b6785 100644 --- a/internal/timber/review/patch_status_test.go +++ b/internal/timber/review/patch_status_test.go @@ -71,6 +71,7 @@ func TestAppendedFeedbackWithUnchangedPatchRequiresReview(t *testing.T) { } func TestReviewStatusAfterStackRewrite(t *testing.T) { + t.Parallel() for _, tc := range []struct { name, status, rewrite, want string legacy bool @@ -174,6 +175,7 @@ func assertStateCounts(t *testing.T, counts []StateCount, status string, commits // A rebase can change blob identities and hunk offsets without changing the // reviewed patch. Python indentation must still distinguish rewritten content. func TestApprovalAfterTouchedFileRebase(t *testing.T) { + t.Parallel() for _, indentChanged := range []bool{false, true} { name := "shifted hunk" if indentChanged { @@ -249,6 +251,7 @@ func rewriteTestStack(t *testing.T, r Repository, view Snapshot, kind string) { } func TestStackRewriteDoesNotRestoreSupersededApproval(t *testing.T) { + t.Parallel() for _, status := range []string{"incomplete", "addressed"} { t.Run(status, func(t *testing.T) { r := testRepo(t) diff --git a/internal/timber/review/patch_test.go b/internal/timber/review/patch_test.go index 986aed3..268d9af 100644 --- a/internal/timber/review/patch_test.go +++ b/internal/timber/review/patch_test.go @@ -11,6 +11,7 @@ import ( // Snapshot owns the persisted fingerprint contract. These cases guard against // omitting binary data, whitespace, paths, or modes from content identity. func TestSnapshotPatchIdentity(t *testing.T) { + t.Parallel() for _, tc := range []struct { name string before, after []byte @@ -69,6 +70,7 @@ func TestSnapshotPatchIdentity(t *testing.T) { } func TestEmptyStacksHaveNoPatchIdentity(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Empty") view, err := r.Snapshot(t.Context()) diff --git a/internal/timber/review/run.go b/internal/timber/review/run.go index 3e4ec00..d78a494 100644 --- a/internal/timber/review/run.go +++ b/internal/timber/review/run.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "os" - "os/exec" "path/filepath" "slices" "strings" @@ -224,7 +223,10 @@ func (r Reviewer) launch(ctx context.Context, path string, stack Stack, lock *os if err := prepareWorktree(ctx, r.Service.Repository, path, stack); err != nil { return err } - cmd := exec.CommandContext(ctx, "tuicr", "--no-update-check", "--stdout", "-r", stack.Base+".."+stack.Tip) + cmd, err := r.Service.Repository.tuicr(ctx, "--no-update-check", "--stdout", "-r", stack.Base+".."+stack.Tip) + if err != nil { + return fmt.Errorf("tuicr interrupted or failed; use timber review commits to recover or replace: %w", err) + } cmd.Dir = path cmd.Stdin = r.Input if wrapped, ok := r.Input.(interface{ UnwrapReader() io.Reader }); ok { diff --git a/internal/timber/review/run_test.go b/internal/timber/review/run_test.go index 2902fba..2161882 100644 --- a/internal/timber/review/run_test.go +++ b/internal/timber/review/run_test.go @@ -6,6 +6,7 @@ import ( "io" "os" "path/filepath" + "slices" "strings" "testing" "time" @@ -13,17 +14,19 @@ import ( "github.com/stretchr/testify/require" ) -func fakeTuicr(t *testing.T, body string) { +func fakeTuicr(t *testing.T, repository *Repository, body string, env ...string) { t.Helper() dir := t.TempDir() require.NoError(t, os.WriteFile(filepath.Join(dir, "tuicr"), []byte("#!/bin/sh\nset -eu\n"+body+"\n"), 0o700)) - t.Setenv("PATH", dir+string(os.PathListSeparator)+os.Getenv("PATH")) + path := dir + string(os.PathListSeparator) + environmentValue(repository.Environment, "PATH") + environment := append(slices.Clone(repository.environment()), env...) + repository.Environment = append(environment, "PATH="+path) } func testReviewer(t *testing.T) (Reviewer, Snapshot, string) { t.Helper() - t.Setenv("XDG_CACHE_HOME", t.TempDir()) r := testRepo(t) + r.Environment = append(r.Environment, "XDG_CACHE_HOME="+t.TempDir()) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") view, err := r.Snapshot(t.Context()) require.NoError(t, err) @@ -32,13 +35,13 @@ func testReviewer(t *testing.T) (Reviewer, Snapshot, string) { } func TestReviewCapturesScopeAndReadsResult(t *testing.T) { + t.Parallel() reviewer, view, store := testReviewer(t) gitTest(t, reviewer.Service.Repository.Dir, "commit", "--allow-empty", "-m", "fixup! Feature") view, err := reviewer.Service.Repository.Snapshot(t.Context()) require.NoError(t, err) log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - fakeTuicr(t, `printf '%s\n' "$PWD" "$@" > "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$PWD" "$@" > "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) scope := view.Stacks[0] path, err := WorktreePath(t.Context(), scope.Repo) require.NoError(t, err) @@ -60,6 +63,7 @@ func TestReviewCapturesScopeAndReadsResult(t *testing.T) { } func TestReviewContinuesThroughEligibleStacksByDefault(t *testing.T) { + t.Parallel() for _, tc := range []struct { name string feedback bool @@ -83,7 +87,6 @@ func TestReviewContinuesThroughEligibleStacksByDefault(t *testing.T) { path, err := WorktreePath(t.Context(), r.Dir) require.NoError(t, err) log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) selected := view.Stacks options := ReviewOptions{} if tc.explicit { @@ -105,7 +108,7 @@ func TestReviewContinuesThroughEligibleStacksByDefault(t *testing.T) { } wantLaunch += stack.Base + ".." + stack.Tip + "\n" } - fakeTuicr(t, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$4" >> "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) result, err := reviewer.Review(t.Context(), options) require.NoError(t, err) @@ -127,6 +130,7 @@ func TestReviewContinuesThroughEligibleStacksByDefault(t *testing.T) { // A review resumes the attempt that captured the same stack, and a stack that a // fixup changed starts a new attempt. func TestInterruptedReviewResumesTheCapturedAttempt(t *testing.T) { + t.Parallel() for _, tc := range []struct { name string amend bool @@ -138,7 +142,7 @@ func TestInterruptedReviewResumesTheCapturedAttempt(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { reviewer, view, store := testReviewer(t) - fakeTuicr(t, "exit 1") + fakeTuicr(t, &reviewer.Service.Repository, "exit 1") _, err := reviewer.Review(t.Context(), ReviewOptions{}) require.ErrorContains(t, err, "tuicr interrupted") path, err := WorktreePath(t.Context(), view.Stacks[0].Repo) @@ -156,7 +160,7 @@ func TestInterruptedReviewResumesTheCapturedAttempt(t *testing.T) { before, err := (Store{Path: view.Path}).Load() require.NoError(t, err) require.Len(t, before.Attempts, 1) - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") result, err := reviewer.Review(t.Context(), ReviewOptions{}) require.NoError(t, err) require.Equal(t, tc.wantStatus, result.Status) @@ -172,8 +176,9 @@ func TestInterruptedReviewResumesTheCapturedAttempt(t *testing.T) { // A saved session that still has work left belongs to a current stack, so a // recovery must resume that attempt and keep the progress it recorded. func TestInterruptedReviewResumesSavedProgress(t *testing.T) { + t.Parallel() reviewer, view, store := testReviewer(t) - fakeTuicr(t, "exit 1") + fakeTuicr(t, &reviewer.Service.Repository, "exit 1") _, err := reviewer.Review(t.Context(), ReviewOptions{}) require.ErrorContains(t, err, "tuicr interrupted") path, err := WorktreePath(t.Context(), view.Stacks[0].Repo) @@ -184,7 +189,7 @@ func TestInterruptedReviewResumesSavedProgress(t *testing.T) { session["files"].(map[string]any)["main.go"].(map[string]any)["reviewed"] = true writeJSON(t, filepath.Join(store, "sessions/0123456789abcdef.json"), session) - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") before, err := (Store{Path: view.Path}).Load() require.NoError(t, err) result, err := reviewer.Review(t.Context(), ReviewOptions{}) @@ -203,10 +208,11 @@ func TestInterruptedReviewResumesSavedProgress(t *testing.T) { } func TestReviewDiscardsUntouchedExit(t *testing.T) { + t.Parallel() for _, savedSession := range []bool{false, true} { t.Run(fmt.Sprintf("saved=%t", savedSession), func(t *testing.T) { reviewer, view, store := testReviewer(t) - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") if savedSession { scope := view.Stacks[0] path, err := WorktreePath(t.Context(), scope.Repo) @@ -227,9 +233,10 @@ func TestReviewDiscardsUntouchedExit(t *testing.T) { } func TestReviewReusesDisposableCheckoutAtSelectedTip(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository - fakeTuicr(t, "exit 0") + fakeTuicr(t, &reviewer.Service.Repository, "exit 0") require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "file.txt"), []byte("first version"), 0o600)) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, ".gitignore"), []byte("artifact.txt\n"), 0o600)) gitTest(t, r.Dir, "add", ".") @@ -262,6 +269,7 @@ func TestReviewReusesDisposableCheckoutAtSelectedTip(t *testing.T) { } func TestDeferredReviewsRemainPending(t *testing.T) { + t.Parallel() reviewer, view, _ := testReviewer(t) require.NoError(t, (Store{Path: view.Path}).Update(func(state *State) error { attempt := newAttempt(view.Stacks[0], "incomplete") @@ -279,13 +287,12 @@ func TestDeferredReviewsRemainPending(t *testing.T) { // A review holds the worktree lock for the whole of tuicr, so nothing else can // start a review, approve, or rewrite the state while the human reviews. func TestReviewHoldsActivityLockDuringLaunch(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) started := filepath.Join(t.TempDir(), "started") released := filepath.Join(t.TempDir(), "released") - t.Setenv("TEST_STARTED", started) - t.Setenv("TEST_RELEASED", released) - fakeTuicr(t, `printf started > "$TEST_STARTED" -while [ ! -f "$TEST_RELEASED" ]; do sleep 0.05; done`) + fakeTuicr(t, &reviewer.Service.Repository, `printf started > "$TEST_STARTED" +while [ ! -f "$TEST_RELEASED" ]; do sleep 0.05; done`, "TEST_STARTED="+started, "TEST_RELEASED="+released) finished := make(chan error, 1) go func() { _, err := reviewer.Review(t.Context(), ReviewOptions{}) @@ -294,7 +301,7 @@ while [ ! -f "$TEST_RELEASED" ]; do sleep 0.05; done`) require.Eventually(t, func() bool { _, err := os.Stat(started) return err == nil - }, 5*time.Second, 10*time.Millisecond) + }, 30*time.Second, 10*time.Millisecond, "tuicr did not start") running, err := reviewer.Service.ReviewRunning(t.Context()) require.NoError(t, err) require.True(t, running, "the launch is part of the live review") @@ -306,6 +313,7 @@ while [ ! -f "$TEST_RELEASED" ]; do sleep 0.05; done`) } func TestRecoverablePriorIgnoresRecordedModelResults(t *testing.T) { + t.Parallel() r := testRepo(t) require.NoError(t, os.WriteFile(filepath.Join(r.Dir, "value"), []byte("one\n"), 0o600)) gitTest(t, r.Dir, "add", "value") @@ -337,6 +345,7 @@ func TestRecoverablePriorIgnoresRecordedModelResults(t *testing.T) { } func TestReviewDiscardsEarlierStackVersion(t *testing.T) { + t.Parallel() for _, status := range []string{"incomplete", "reviewing"} { t.Run(status, func(t *testing.T) { reviewer, view, store := testReviewer(t) @@ -362,8 +371,7 @@ func TestReviewDiscardsEarlierStackVersion(t *testing.T) { savedEntry{"nnutter/timber@~bbbb/commits/current", path, current}, ) log := filepath.Join(t.TempDir(), "launch") - t.Setenv("TEST_LAUNCH_LOG", log) - fakeTuicr(t, `printf '%s\n' "$4" > "$TEST_LAUNCH_LOG"`) + fakeTuicr(t, &reviewer.Service.Repository, `printf '%s\n' "$4" > "$TEST_LAUNCH_LOG"`, "TEST_LAUNCH_LOG="+log) result, err := reviewer.Review(t.Context(), ReviewOptions{}) require.NoError(t, err) require.Equal(t, "range_complete", result.Status) diff --git a/internal/timber/review/saved.go b/internal/timber/review/saved.go index 048eadb..f27a32b 100644 --- a/internal/timber/review/saved.go +++ b/internal/timber/review/saved.go @@ -342,12 +342,12 @@ func sameRepositoryPath(a, b string) bool { } // DefaultSavedReader uses tuicr's platform store, then the other platform path. -func DefaultSavedReader() (SavedReader, error) { - home, err := os.UserHomeDir() +func DefaultSavedReader(environment []string) (SavedReader, error) { + home, err := savedHomeDirectory(environment) if err != nil { return SavedReader{}, err } - data := strings.TrimSpace(os.Getenv("XDG_DATA_HOME")) + data := strings.TrimSpace(environmentValue(environment, "XDG_DATA_HOME")) if data == "" { data = filepath.Join(home, ".local", "share") } @@ -359,6 +359,17 @@ func DefaultSavedReader() (SavedReader, error) { return SavedReader{Stores: []string{linux, mac}}, nil } +func savedHomeDirectory(environment []string) (string, error) { + if environment == nil { + return os.UserHomeDir() + } + home := environmentValue(environment, "HOME") + if home == "" { + return "", errors.New("HOME is not set") + } + return home, nil +} + type object map[string]jsontext.Value func decodeRequired[T any](obj object, key string) (T, error) { diff --git a/internal/timber/review/saved_test.go b/internal/timber/review/saved_test.go index 3b3da0c..36cb9ba 100644 --- a/internal/timber/review/saved_test.go +++ b/internal/timber/review/saved_test.go @@ -38,6 +38,7 @@ func savedFixture(t *testing.T, stack Stack, store string, reviewed bool) map[st } func TestSavedReviewOutcomes(t *testing.T) { + t.Parallel() cases := []struct { name string mutate func(map[string]any) @@ -93,6 +94,7 @@ func TestSavedReviewOutcomes(t *testing.T) { } func TestSavedReviewRejectsCorruption(t *testing.T) { + t.Parallel() cases := []struct { name string mutate func(map[string]any) @@ -124,6 +126,7 @@ func TestSavedReviewRejectsCorruption(t *testing.T) { } func TestSavedReviewScopeAndDiscovery(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") view, err := r.Snapshot(t.Context()) @@ -194,6 +197,7 @@ func writeSavedIndex(t *testing.T, store string, entries ...savedEntry) { } func TestSavedWriterDeletesCapturedSession(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") first, err := r.Snapshot(t.Context()) @@ -236,6 +240,7 @@ func TestSavedWriterDeletesCapturedSession(t *testing.T) { } func TestSavedWriterToleratesMissingStore(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") view, err := r.Snapshot(t.Context()) diff --git a/internal/timber/review/service.go b/internal/timber/review/service.go index f32dd53..11f2932 100644 --- a/internal/timber/review/service.go +++ b/internal/timber/review/service.go @@ -141,7 +141,7 @@ func (s Service) Feedback(ctx context.Context) (Result, error) { if err != nil { return Result{}, err } - reader, err := DefaultSavedReader() + reader, err := DefaultSavedReader(s.Repository.Environment) if err != nil { return Result{}, err } diff --git a/internal/timber/review/state_test.go b/internal/timber/review/state_test.go index 28c2d38..6f4f495 100644 --- a/internal/timber/review/state_test.go +++ b/internal/timber/review/state_test.go @@ -9,6 +9,7 @@ import ( ) func TestApprovalAndSupersession(t *testing.T) { + t.Parallel() r := testRepo(t) id := "I" + strings.Repeat("c", 40) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "One\n\nChange-Id: "+id) @@ -47,6 +48,7 @@ func TestApprovalAndSupersession(t *testing.T) { } func TestApprovalBlocksCurrentFeedbackAndActiveAttempts(t *testing.T) { + t.Parallel() for _, status := range []string{"feedback", "reviewing"} { t.Run(status, func(t *testing.T) { r := testRepo(t) @@ -68,6 +70,7 @@ func TestApprovalBlocksCurrentFeedbackAndActiveAttempts(t *testing.T) { } func TestApprovalWithPendingAttemptsOutsideRange(t *testing.T) { + t.Parallel() for _, status := range []string{"feedback", "reviewing"} { t.Run(status, func(t *testing.T) { r := testRepo(t) @@ -105,6 +108,7 @@ func TestApprovalWithPendingAttemptsOutsideRange(t *testing.T) { } func TestStateLockAndCorruption(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "One") view, err := r.Snapshot(t.Context()) diff --git a/internal/timber/review/status_feedback_test.go b/internal/timber/review/status_feedback_test.go index 1f25cf0..8a81449 100644 --- a/internal/timber/review/status_feedback_test.go +++ b/internal/timber/review/status_feedback_test.go @@ -10,6 +10,7 @@ import ( ) func TestStatusOmitsFeedbackFromEarlierStacks(t *testing.T) { + t.Parallel() r := testRepo(t) for _, name := range []string{"one", "two"} { require.NoError(t, os.WriteFile(filepath.Join(r.Dir, name), []byte(name+"\n"), 0o600)) diff --git a/internal/timber/review/worktree_move_test.go b/internal/timber/review/worktree_move_test.go index 50ab7c4..33ba505 100644 --- a/internal/timber/review/worktree_move_test.go +++ b/internal/timber/review/worktree_move_test.go @@ -26,6 +26,7 @@ func movedReviewCheckout(t *testing.T) (Repository, string, string, string) { } func TestPrepareMovedReviewCheckout(t *testing.T) { + t.Parallel() r, path, _, _ := movedReviewCheckout(t) file := filepath.Join(path, "incidental") require.NoError(t, os.WriteFile(file, []byte("discard"), 0o600)) @@ -37,6 +38,7 @@ func TestPrepareMovedReviewCheckout(t *testing.T) { } func TestPrepareMovedReviewCheckoutRejectsUnsafeState(t *testing.T) { + t.Parallel() for _, scenario := range []string{"live old checkout", "wrong pointer", "wrong backlink", "attached checkout", "duplicate registration"} { t.Run(scenario, func(t *testing.T) { r, path, oldPath, registration := movedReviewCheckout(t) diff --git a/internal/timber/review/worktree_test.go b/internal/timber/review/worktree_test.go index 936816b..272d302 100644 --- a/internal/timber/review/worktree_test.go +++ b/internal/timber/review/worktree_test.go @@ -9,6 +9,7 @@ import ( ) func TestReviewCheckoutIsSharedAcrossFeatureWorktrees(t *testing.T) { + t.Parallel() r := testRepo(t) gitTest(t, r.Dir, "commit", "--allow-empty", "-m", "Feature") other := filepath.Join(t.TempDir(), "other") @@ -28,6 +29,7 @@ func TestReviewCheckoutIsSharedAcrossFeatureWorktrees(t *testing.T) { } func TestReviewCheckoutRejectsUnownedDirectory(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) path, err := WorktreePath(t.Context(), reviewer.Service.Repository.Dir) require.NoError(t, err) @@ -42,6 +44,7 @@ func TestReviewCheckoutRejectsUnownedDirectory(t *testing.T) { } func TestReviewCheckoutRejectsReplacedGitRegistration(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository path, err := WorktreePath(t.Context(), r.Dir) @@ -57,6 +60,7 @@ func TestReviewCheckoutRejectsReplacedGitRegistration(t *testing.T) { } func TestReviewCheckoutRejectsAttachedBranch(t *testing.T) { + t.Parallel() reviewer, _, _ := testReviewer(t) r := reviewer.Service.Repository path, err := WorktreePath(t.Context(), r.Dir) diff --git a/mise.toml b/mise.toml index 411d485..bc35b6a 100644 --- a/mise.toml +++ b/mise.toml @@ -45,8 +45,21 @@ go tool vhs docs/demo/demo.tape ''' [tasks.coverage] -description = "Run tests and generate coverage report" -run = "go test -coverprofile=coverage.out -covermode=atomic ./... && go tool cover -func=coverage.out" +description = "Measure coverage across package boundaries" +run = "go test -coverpkg=./... -coverprofile=coverage.out -covermode=atomic ./... && go tool cover -func=coverage.out" + +[tasks.coverage-process] +description = "Measure coverage in CLI subprocesses that can flush counters on exit" +run = ''' +#!/usr/bin/env bash +set -euo pipefail +export GOCOVERDIR +GOCOVERDIR="$(mktemp -d "$PWD/.coverage-process.XXXXXX")" +trap 'rm -rf "$GOCOVERDIR"' EXIT +go test -count=1 . ./internal/cli ./internal/cli/review +go tool covdata textfmt -i="$GOCOVERDIR" -o=coverage-process.out +go tool cover -func=coverage-process.out +''' [tasks.upgrade] description = "Upgrade the tools to their newest releases" diff --git a/signal_test.go b/signal_test.go index 6e4ebe6..d704b90 100644 --- a/signal_test.go +++ b/signal_test.go @@ -12,6 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/nnutter/timber/internal/testenv" ) func TestMain(m *testing.M) { @@ -46,7 +48,7 @@ func runFakeGit(ready string) { func TestTimberForwardsSignalsToGit(t *testing.T) { dir := t.TempDir() binary := filepath.Join(dir, "timber") - build := exec.CommandContext(t.Context(), "go", "build", "-o", binary, ".") + build := exec.CommandContext(t.Context(), "go", testenv.BuildArgs(binary, ".")...) output, err := build.CombinedOutput() require.NoError(t, err, "%s", output) testBinary, err := os.Executable()