1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
|
package executor
import (
"context"
"fmt"
"io"
"log/slog"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
"github.com/thepeterstone/claudomator/internal/storage"
"github.com/thepeterstone/claudomator/internal/task"
)
func TestContainerRunner_BuildDockerArgs(t *testing.T) {
runner := &ContainerRunner{
APIURL: "http://localhost:8484",
DropsDir: "/data/drops",
SSHAuthSock: "/tmp/ssh.sock",
}
workspace := "/tmp/ws"
taskID := "task-123"
agentHome := "/tmp/ws/.agent-home"
args := runner.buildDockerArgs(workspace, agentHome, taskID)
expected := []string{
"run", "--rm",
"--add-host=host.docker.internal:host-gateway",
fmt.Sprintf("--user=%d:%d", os.Getuid(), os.Getgid()),
"-v", "/tmp/ws:/workspace",
"-v", "/tmp/ws/.agent-home:/home/agent",
"-w", "/workspace",
"--env-file", "/tmp/ws/.claudomator-env",
"-e", "HOME=/home/agent",
"-e", "CLAUDOMATOR_API_URL=http://host.docker.internal:8484",
"-e", "CLAUDOMATOR_TASK_ID=task-123",
"-e", "CLAUDOMATOR_DROP_DIR=/data/drops",
"-v", "/tmp/ssh.sock:/tmp/ssh-auth.sock",
"-e", "SSH_AUTH_SOCK=/tmp/ssh-auth.sock",
}
if len(args) != len(expected) {
t.Fatalf("expected %d args, got %d. Got: %v", len(expected), len(args), args)
}
for i, v := range args {
if v != expected[i] {
t.Errorf("arg %d: expected %q, got %q", i, expected[i], v)
}
}
}
func TestContainerRunner_BuildInnerCmd(t *testing.T) {
runner := &ContainerRunner{}
t.Run("claude-fresh", func(t *testing.T) {
tk := &task.Task{Agent: task.AgentConfig{Type: "claude"}}
exec := &storage.Execution{}
cmd := runner.buildInnerCmd(tk, exec, false)
cmdStr := strings.Join(cmd, " ")
if strings.Contains(cmdStr, "--resume") {
t.Errorf("unexpected --resume flag in fresh run: %q", cmdStr)
}
if !strings.Contains(cmdStr, "INST=$(cat /workspace/.claudomator-instructions.txt); claude -p \"$INST\"") {
t.Errorf("expected cat instructions in sh command, got %q", cmdStr)
}
})
t.Run("claude-resume", func(t *testing.T) {
tk := &task.Task{Agent: task.AgentConfig{Type: "claude"}}
exec := &storage.Execution{ResumeSessionID: "orig-session-123"}
cmd := runner.buildInnerCmd(tk, exec, true)
cmdStr := strings.Join(cmd, " ")
if !strings.Contains(cmdStr, "--resume orig-session-123") {
t.Errorf("expected --resume flag with correct session ID, got %q", cmdStr)
}
})
t.Run("gemini", func(t *testing.T) {
tk := &task.Task{Agent: task.AgentConfig{Type: "gemini"}}
exec := &storage.Execution{}
cmd := runner.buildInnerCmd(tk, exec, false)
cmdStr := strings.Join(cmd, " ")
if !strings.Contains(cmdStr, "gemini -p \"$INST\"") {
t.Errorf("expected gemini command with safer quoting, got %q", cmdStr)
}
})
t.Run("custom-binaries", func(t *testing.T) {
runnerCustom := &ContainerRunner{
ClaudeBinary: "/usr/bin/claude-v2",
GeminiBinary: "/usr/local/bin/gemini-pro",
}
tkClaude := &task.Task{Agent: task.AgentConfig{Type: "claude"}}
cmdClaude := runnerCustom.buildInnerCmd(tkClaude, &storage.Execution{}, false)
if !strings.Contains(strings.Join(cmdClaude, " "), "/usr/bin/claude-v2 -p") {
t.Errorf("expected custom claude binary, got %q", cmdClaude)
}
tkGemini := &task.Task{Agent: task.AgentConfig{Type: "gemini"}}
cmdGemini := runnerCustom.buildInnerCmd(tkGemini, &storage.Execution{}, false)
if !strings.Contains(strings.Join(cmdGemini, " "), "/usr/local/bin/gemini-pro -p") {
t.Errorf("expected custom gemini binary, got %q", cmdGemini)
}
})
}
func TestContainerRunner_Run_PreservesWorkspaceOnFailure(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
// Mock docker run to exit 1
if name == "docker" {
return exec.Command("sh", "-c", "exit 1")
}
// Mock git clone to succeed and create the directory
if name == "git" && len(arg) > 0 && arg[0] == "clone" {
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
return exec.Command("true")
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "test-task",
RepositoryURL: "https://github.com/example/repo.git",
Agent: task.AgentConfig{Type: "claude"},
}
exec := &storage.Execution{ID: "test-exec", TaskID: "test-task"}
err := runner.Run(context.Background(), tk, exec)
if err == nil {
t.Fatal("expected error due to mocked docker failure")
}
// Verify SandboxDir was set and directory exists.
if exec.SandboxDir == "" {
t.Fatal("expected SandboxDir to be set even on failure")
}
if _, statErr := os.Stat(exec.SandboxDir); statErr != nil {
t.Errorf("expected sandbox directory to be preserved, but stat failed: %v", statErr)
} else {
os.RemoveAll(exec.SandboxDir)
}
}
func TestBlockedError_IncludesSandboxDir(t *testing.T) {
// This test requires mocking 'docker run' or the whole Run() which is hard.
// But we can test that returning BlockedError works.
err := &BlockedError{
QuestionJSON: `{"text":"?"}`,
SessionID: "s1",
SandboxDir: "/tmp/s1",
}
if !strings.Contains(err.Error(), "task blocked") {
t.Errorf("wrong error message: %v", err)
}
}
func TestIsCompletionReport(t *testing.T) {
tests := []struct {
name string
json string
expected bool
}{
{
name: "real question with options",
json: `{"text": "Should I proceed with implementation?", "options": ["Yes", "No"]}`,
expected: false,
},
{
name: "real question no options",
json: `{"text": "Which approach do you prefer?"}`,
expected: false,
},
{
name: "completion report no options no question mark",
json: `{"text": "All tests pass. Implementation complete. Summary written to CLAUDOMATOR_SUMMARY_FILE."}`,
expected: true,
},
{
name: "completion report with empty options",
json: `{"text": "Feature implemented and committed.", "options": []}`,
expected: true,
},
{
name: "invalid json treated as not a report",
json: `not json`,
expected: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := isCompletionReport(tt.json)
if got != tt.expected {
t.Errorf("isCompletionReport(%q) = %v, want %v", tt.json, got, tt.expected)
}
})
}
}
func TestTailFile_ReturnsLastNLines(t *testing.T) {
f, err := os.CreateTemp("", "tailfile-*")
if err != nil {
t.Fatal(err)
}
defer os.Remove(f.Name())
for i := 1; i <= 30; i++ {
fmt.Fprintf(f, "line %d\n", i)
}
f.Close()
got := tailFile(f.Name(), 5)
lines := strings.Split(strings.TrimSpace(got), "\n")
if len(lines) != 5 {
t.Fatalf("want 5 lines, got %d: %q", len(lines), got)
}
if lines[0] != "line 26" || lines[4] != "line 30" {
t.Errorf("want lines 26-30, got: %q", got)
}
}
func TestDetectUncommittedChanges_ModifiedFile(t *testing.T) {
dir := t.TempDir()
run := func(args ...string) {
cmd := exec.Command(args[0], args[1:]...)
cmd.Dir = dir
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("%v: %s", args, out)
}
}
run("git", "init", dir)
run("git", "config", "user.email", "test@test.com")
run("git", "config", "user.name", "Test")
// Create and commit a file
if err := os.WriteFile(dir+"/main.go", []byte("package main"), 0644); err != nil {
t.Fatal(err)
}
run("git", "add", "main.go")
run("git", "commit", "-m", "init")
// Now modify without committing — simulates agent that forgot to commit
if err := os.WriteFile(dir+"/main.go", []byte("package main\n// changed"), 0644); err != nil {
t.Fatal(err)
}
err := detectUncommittedChanges(dir)
if err == nil {
t.Fatal("expected error for modified uncommitted file, got nil")
}
if !strings.Contains(err.Error(), "uncommitted") {
t.Errorf("error should mention uncommitted, got: %v", err)
}
}
func TestDetectUncommittedChanges_NewUntrackedSourceFile(t *testing.T) {
dir := t.TempDir()
run := func(args ...string) {
cmd := exec.Command(args[0], args[1:]...)
cmd.Dir = dir
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("%v: %s", args, out)
}
}
run("git", "init", dir)
run("git", "config", "user.email", "test@test.com")
run("git", "config", "user.name", "Test")
run("git", "commit", "--allow-empty", "-m", "init")
// Agent wrote a new file but never committed it
if err := os.WriteFile(dir+"/newfile.go", []byte("package main"), 0644); err != nil {
t.Fatal(err)
}
err := detectUncommittedChanges(dir)
if err == nil {
t.Fatal("expected error for new untracked source file, got nil")
}
}
func TestDetectUncommittedChanges_ScaffoldFilesIgnored(t *testing.T) {
dir := t.TempDir()
run := func(args ...string) {
cmd := exec.Command(args[0], args[1:]...)
cmd.Dir = dir
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("%v: %s", args, out)
}
}
run("git", "init", dir)
run("git", "config", "user.email", "test@test.com")
run("git", "config", "user.name", "Test")
run("git", "commit", "--allow-empty", "-m", "init")
// Write only scaffold files that the harness injects — should not trigger error
_ = os.WriteFile(dir+"/.claudomator-env", []byte("KEY=val"), 0600)
_ = os.WriteFile(dir+"/.claudomator-instructions.txt", []byte("do stuff"), 0644)
_ = os.MkdirAll(dir+"/.agent-home/.claude", 0755)
err := detectUncommittedChanges(dir)
if err != nil {
t.Errorf("scaffold files should not trigger uncommitted error, got: %v", err)
}
}
func TestDetectUncommittedChanges_CleanRepo(t *testing.T) {
dir := t.TempDir()
run := func(args ...string) {
cmd := exec.Command(args[0], args[1:]...)
cmd.Dir = dir
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("%v: %s", args, out)
}
}
run("git", "init", dir)
run("git", "config", "user.email", "test@test.com")
run("git", "config", "user.name", "Test")
if err := os.WriteFile(dir+"/main.go", []byte("package main"), 0644); err != nil {
t.Fatal(err)
}
run("git", "add", "main.go")
run("git", "commit", "-m", "init")
// No modifications — should pass
err := detectUncommittedChanges(dir)
if err != nil {
t.Errorf("clean repo should not error, got: %v", err)
}
}
func TestGitSafe_PrependsSafeDirectory(t *testing.T) {
got := gitSafe("-C", "/some/path", "status")
want := []string{"-c", "safe.directory=*", "-C", "/some/path", "status"}
if len(got) != len(want) {
t.Fatalf("gitSafe() = %v, want %v", got, want)
}
for i := range want {
if got[i] != want[i] {
t.Errorf("gitSafe()[%d] = %q, want %q", i, got[i], want[i])
}
}
}
func TestContainerRunner_MissingCredentials_FailsFast(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
claudeConfigDir := t.TempDir()
// Set up ClaudeConfigDir with MISSING credentials (so pre-flight fails)
// Don't create .credentials.json
// But DO create .claude.json so the test isolates the credentials check
if err := os.WriteFile(filepath.Join(claudeConfigDir, ".claude.json"), []byte("{}"), 0644); err != nil {
t.Fatal(err)
}
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
ClaudeConfigDir: claudeConfigDir,
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
if name == "git" && len(arg) > 0 && arg[0] == "clone" {
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
return exec.Command("true")
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "test-missing-creds",
RepositoryURL: "https://github.com/example/repo.git",
Agent: task.AgentConfig{Type: "claude"},
}
e := &storage.Execution{ID: "test-exec", TaskID: "test-missing-creds"}
err := runner.Run(context.Background(), tk, e)
if err == nil {
t.Fatal("expected error due to missing credentials, got nil")
}
if !strings.Contains(err.Error(), "credentials not found") {
t.Errorf("expected 'credentials not found' error, got: %v", err)
}
}
func TestContainerRunner_MissingSettings_FailsFast(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
claudeConfigDir := t.TempDir()
// Only create credentials but NOT .claude.json
if err := os.WriteFile(filepath.Join(claudeConfigDir, ".credentials.json"), []byte("{}"), 0600); err != nil {
t.Fatal(err)
}
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
ClaudeConfigDir: claudeConfigDir,
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
if name == "git" && len(arg) > 0 && arg[0] == "clone" {
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
return exec.Command("true")
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "test-missing-settings",
RepositoryURL: "https://github.com/example/repo.git",
Agent: task.AgentConfig{Type: "claude"},
}
e := &storage.Execution{ID: "test-exec-2", TaskID: "test-missing-settings"}
err := runner.Run(context.Background(), tk, e)
if err == nil {
t.Fatal("expected error due to missing settings, got nil")
}
if !strings.Contains(err.Error(), "claude settings") {
t.Errorf("expected 'claude settings' error, got: %v", err)
}
}
func TestIsAuthError_DetectsAllVariants(t *testing.T) {
tests := []struct {
msg string
want bool
}{
{"Not logged in", true},
{"OAuth token has expired", true},
{"authentication_error: invalid token", true},
{"Please run /login to authenticate", true},
{"container execution failed: exit status 1", false},
{"git clone failed", false},
{"", false},
}
for _, tt := range tests {
var err error
if tt.msg != "" {
err = fmt.Errorf("%s", tt.msg)
}
got := isAuthError(err)
if got != tt.want {
t.Errorf("isAuthError(%q) = %v, want %v", tt.msg, got, tt.want)
}
}
}
func TestContainerRunner_AuthError_SyncsAndRetries(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
// Create a sync script that creates a marker file
syncDir := t.TempDir()
syncMarker := filepath.Join(syncDir, "sync-called")
syncScript := filepath.Join(syncDir, "sync-creds")
os.WriteFile(syncScript, []byte("#!/bin/sh\ntouch "+syncMarker+"\n"), 0755)
claudeConfigDir := t.TempDir()
// Create both credential files in ClaudeConfigDir
os.WriteFile(filepath.Join(claudeConfigDir, ".credentials.json"), []byte(`{"token":"fresh"}`), 0600)
os.WriteFile(filepath.Join(claudeConfigDir, ".claude.json"), []byte("{}"), 0644)
callCount := 0
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
ClaudeConfigDir: claudeConfigDir,
CredentialSyncCmd: syncScript,
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
if name == "git" {
if len(arg) > 0 && arg[0] == "clone" {
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
}
return exec.Command("true")
}
if name == "docker" {
callCount++
if callCount == 1 {
// First docker call fails with auth error
return exec.Command("sh", "-c", "echo 'Not logged in' >&2; exit 1")
}
// Second docker call "succeeds"
return exec.Command("sh", "-c", "exit 0")
}
if name == syncScript {
return exec.Command("sh", "-c", "touch "+syncMarker)
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "auth-retry-test",
RepositoryURL: "https://github.com/example/repo.git",
Agent: task.AgentConfig{Type: "claude", Instructions: "test"},
}
e := &storage.Execution{ID: "auth-retry-exec", TaskID: "auth-retry-test"}
// Run — first attempt will fail with auth error, triggering sync+retry
runner.Run(context.Background(), tk, e)
// We don't check error strictly since second run may also fail (git push etc.)
// What we care about is that docker was called twice and sync was called
if callCount < 2 {
t.Errorf("expected docker to be called at least twice (original + retry), got %d", callCount)
}
if _, err := os.Stat(syncMarker); os.IsNotExist(err) {
t.Error("expected sync-credentials to be called, but marker file not found")
}
}
func TestContainerRunner_ClonesStoryBranch(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
var checkoutArgs []string
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
if name == "git" && len(arg) > 0 && arg[0] == "clone" {
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
return exec.Command("true")
}
// Capture checkout calls: both "git checkout <branch>" and "git -C <dir> checkout <branch>"
for i, a := range arg {
if a == "checkout" {
checkoutArgs = append([]string{}, arg[i:]...)
break
}
}
if name == "docker" {
return exec.Command("sh", "-c", "exit 1")
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "story-branch-test",
RepositoryURL: "https://example.com/repo.git",
BranchName: "story/my-feature",
Agent: task.AgentConfig{Type: "claude"},
}
e := &storage.Execution{ID: "exec-1", TaskID: "story-branch-test"}
runner.Run(context.Background(), tk, e)
os.RemoveAll(e.SandboxDir)
// Assert git checkout was called with the story branch name.
if len(checkoutArgs) == 0 {
t.Fatal("expected git checkout to be called for story branch, but it was not")
}
found := false
for _, a := range checkoutArgs {
if a == "story/my-feature" {
found = true
break
}
}
if !found {
t.Errorf("expected git checkout story/my-feature, got args: %v", checkoutArgs)
}
}
func TestContainerRunner_ClonesDefaultBranchWhenNoBranchName(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
var cloneArgs []string
runner := &ContainerRunner{
Logger: logger,
Image: "busybox",
Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
if name == "git" && len(arg) > 0 && arg[0] == "clone" {
cloneArgs = append([]string{}, arg...)
dir := arg[len(arg)-1]
os.MkdirAll(dir, 0755)
return exec.Command("true")
}
if name == "docker" {
return exec.Command("sh", "-c", "exit 1")
}
return exec.Command("true")
},
}
tk := &task.Task{
ID: "no-branch-test",
RepositoryURL: "https://example.com/repo.git",
Agent: task.AgentConfig{Type: "claude"},
}
e := &storage.Execution{ID: "exec-2", TaskID: "no-branch-test"}
runner.Run(context.Background(), tk, e)
os.RemoveAll(e.SandboxDir)
for _, a := range cloneArgs {
if a == "--branch" {
t.Errorf("expected no --branch flag for task without BranchName, got args: %v", cloneArgs)
}
}
}
func TestEnsureStoryBranch_CreatesMissingBranch(t *testing.T) {
// Set up a bare repo and a local clone to test branch creation.
dir := t.TempDir()
bare := filepath.Join(dir, "bare.git")
local := filepath.Join(dir, "local")
// Create bare repo with an initial commit.
if out, err := exec.Command("git", "init", "--bare", bare).CombinedOutput(); err != nil {
t.Fatalf("git init bare: %v\n%s", err, out)
}
if out, err := exec.Command("git", "clone", bare, local).CombinedOutput(); err != nil {
t.Fatalf("git clone: %v\n%s", err, out)
}
if out, err := exec.Command("git", "-C", local, "commit", "--allow-empty", "-m", "init").CombinedOutput(); err != nil {
t.Fatalf("git commit: %v\n%s", err, out)
}
if out, err := exec.Command("git", "-C", local, "push", "origin", "main").CombinedOutput(); err != nil {
// try master
if out2, err2 := exec.Command("git", "-C", local, "push", "origin", "HEAD:main").CombinedOutput(); err2 != nil {
t.Fatalf("git push main: %v\n%s\n%s", err, out, out2)
}
}
runner := &ContainerRunner{Logger: slog.Default()}
branch := "story/test-branch"
// Branch should not exist yet.
out, _ := exec.Command("git", "ls-remote", "--heads", bare, branch).CombinedOutput()
if len(strings.TrimSpace(string(out))) > 0 {
t.Fatal("branch should not exist before ensureStoryBranch")
}
if err := runner.ensureStoryBranch(context.Background(), bare, branch, ""); err != nil {
t.Fatalf("ensureStoryBranch: %v", err)
}
// Branch should now exist in the bare repo.
out, err := exec.Command("git", "ls-remote", "--heads", bare, branch).CombinedOutput()
if err != nil || len(strings.TrimSpace(string(out))) == 0 {
t.Errorf("branch %q not found in bare repo after ensureStoryBranch: %s", branch, out)
}
}
func TestEnsureStoryBranch_IdempotentIfExists(t *testing.T) {
dir := t.TempDir()
bare := filepath.Join(dir, "bare.git")
local := filepath.Join(dir, "local")
if out, err := exec.Command("git", "init", "--bare", bare).CombinedOutput(); err != nil {
t.Fatalf("git init bare: %v\n%s", err, out)
}
if out, err := exec.Command("git", "clone", bare, local).CombinedOutput(); err != nil {
t.Fatalf("git clone: %v\n%s", err, out)
}
if out, err := exec.Command("git", "-C", local, "commit", "--allow-empty", "-m", "init").CombinedOutput(); err != nil {
t.Fatalf("git commit: %v\n%s", err, out)
}
if _, err := exec.Command("git", "-C", local, "push", "origin", "HEAD:main").CombinedOutput(); err != nil {
t.Fatalf("push main: %v", err)
}
branch := "story/existing-branch"
// Pre-create the branch.
if out, err := exec.Command("git", "-C", local, "checkout", "-b", branch).CombinedOutput(); err != nil {
t.Fatalf("checkout -b: %v\n%s", err, out)
}
if out, err := exec.Command("git", "-C", local, "push", "origin", branch).CombinedOutput(); err != nil {
t.Fatalf("push branch: %v\n%s", err, out)
}
runner := &ContainerRunner{Logger: slog.Default()}
// Should be a no-op, not an error.
if err := runner.ensureStoryBranch(context.Background(), bare, branch, ""); err != nil {
t.Fatalf("ensureStoryBranch on existing branch: %v", err)
}
}
|