Skip to content

Commit f2b8dec

Browse files
steveyeggeclaude
andcommitted
fix(test): restore correct testutil function names after rebase conflict
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent c4a010c commit f2b8dec

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

internal/convoy/testmain_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ func TestMain(m *testing.M) {
1515
// container (via BEADS_DOLT_PORT), the databases are destroyed when the
1616
// container is terminated at cleanup — preventing orphan
1717
// accumulation in the shared production Dolt data dir.
18-
if err := testutil.EnsureDoltContainerForTestMain(); err != nil {
18+
if err := testutil.EnsureDoltForTestMain(); err != nil {
1919
fmt.Fprintf(os.Stderr, "convoy TestMain: skipping — %v\n", err)
2020
os.Exit(0)
2121
}
2222

2323
code := m.Run()
2424

25-
testutil.TerminateDoltContainer()
25+
testutil.CleanupDoltServer()
2626
os.Exit(code)
2727
}

internal/daemon/testmain_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestMain(m *testing.M) {
1818
// those to an isolated container (via BEADS_DOLT_PORT), the databases are
1919
// destroyed when the container is terminated at cleanup —
2020
// preventing orphan accumulation in the shared production Dolt data dir.
21-
if err := testutil.EnsureDoltContainerForTestMain(); err != nil {
21+
if err := testutil.EnsureDoltForTestMain(); err != nil {
2222
fmt.Fprintf(os.Stderr, "daemon TestMain: skipping — %v\n", err)
2323
os.Exit(0)
2424
}
@@ -41,6 +41,6 @@ func TestMain(m *testing.M) {
4141
socketPath := filepath.Join(tmux.SocketDir(), tmuxSocket)
4242
_ = os.Remove(socketPath)
4343
}
44-
testutil.TerminateDoltContainer()
44+
testutil.CleanupDoltServer()
4545
os.Exit(code)
4646
}

0 commit comments

Comments
 (0)