PersistentPreRunE on adminCmd fires before main.go's PersistentPreRun sets serverMode/cmdCtx.ServerMode. Cobra runs child PersistentPreRunE before parent PersistentPreRun, so isEmbeddedMode() sees cmdCtx.ServerMode as false (zero value) even when metadata.json declares dolt_mode=server. Fix: remove PersistentPreRunE from adminCmd. Add requireServerMode() helper and call it at the top of each subcommand's Run func, after store init has populated cmdCtx.ServerMode correctly. Fixes: bd admin compact, bd admin cleanup, bd admin reset all returning 'not yet supported in embedded mode' for server-mode projects.
374 lines
11 KiB
Go
374 lines
11 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdDolt runs "bd dolt" with the given args and returns stdout.
|
|
func bdDolt(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"dolt"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd dolt %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
// bdDoltFail runs "bd dolt" expecting failure and returns stderr+stdout.
|
|
func bdDoltFail(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"dolt"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Fatalf("expected bd dolt %s to fail, but succeeded:\n%s", strings.Join(args, " "), out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedDolt(t *testing.T) {
|
|
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
|
|
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt integration tests")
|
|
}
|
|
t.Parallel()
|
|
|
|
bd := buildEmbeddedBD(t)
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "td")
|
|
|
|
// ===== Server-only commands must fail in embedded mode =====
|
|
|
|
// status and show are intentionally NOT in this list: they report
|
|
// embedded-mode state rather than erroring out. See the
|
|
// embedded_status/embedded_show subtests below.
|
|
serverOnlyCmds := []struct {
|
|
name string
|
|
args []string
|
|
}{
|
|
{"start", []string{"start"}},
|
|
{"stop", []string{"stop"}},
|
|
{"test", []string{"test"}},
|
|
{"set", []string{"set", "host", "127.0.0.1"}},
|
|
{"killall", []string{"killall"}},
|
|
{"clean-databases", []string{"clean-databases"}},
|
|
}
|
|
|
|
for _, tc := range serverOnlyCmds {
|
|
t.Run("blocked_"+tc.name, func(t *testing.T) {
|
|
out := bdDoltFail(t, bd, dir, tc.args...)
|
|
if !strings.Contains(out, "not supported in embedded mode") {
|
|
t.Errorf("expected 'not supported in embedded mode' in output for dolt %s: %s", tc.name, out)
|
|
}
|
|
})
|
|
}
|
|
|
|
// ===== Embedded-mode inspection commands succeed with embedded-mode output =====
|
|
|
|
t.Run("embedded_status", func(t *testing.T) {
|
|
out := bdDolt(t, bd, dir, "status")
|
|
if !strings.Contains(out, "embedded") {
|
|
t.Errorf("expected embedded-mode status output to mention 'embedded': %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("embedded_status_json", func(t *testing.T) {
|
|
out := bdDolt(t, bd, dir, "status", "--json")
|
|
var result map[string]interface{}
|
|
if err := json.Unmarshal([]byte(out), &result); err != nil {
|
|
t.Fatalf("status --json returned invalid JSON: %v\n%s", err, out)
|
|
}
|
|
if result["mode"] != "embedded" {
|
|
t.Errorf("mode = %v, want embedded", result["mode"])
|
|
}
|
|
if result["server_running"] != false {
|
|
t.Errorf("server_running = %v, want false", result["server_running"])
|
|
}
|
|
if _, ok := result["running"]; ok {
|
|
t.Errorf("running should be omitted for embedded mode; use server_running instead: %v", result["running"])
|
|
}
|
|
})
|
|
|
|
t.Run("embedded_show", func(t *testing.T) {
|
|
out := bdDolt(t, bd, dir, "show")
|
|
if !strings.Contains(out, "Mode:") || !strings.Contains(out, "embedded") {
|
|
t.Errorf("expected embedded-mode show output to contain 'Mode:' and 'embedded': %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Working commands =====
|
|
|
|
// Create an issue so there are pending changes to commit
|
|
bdCreate(t, bd, dir, "Dolt commit test issue", "--type", "task")
|
|
|
|
t.Run("commit", func(t *testing.T) {
|
|
out := bdDolt(t, bd, dir, "commit")
|
|
// Should succeed — either commits or reports nothing to commit
|
|
_ = out
|
|
})
|
|
|
|
t.Run("commit_with_message", func(t *testing.T) {
|
|
bdCreate(t, bd, dir, "Another issue for commit", "--type", "task")
|
|
out := bdDolt(t, bd, dir, "commit", "-m", "test commit message")
|
|
_ = out
|
|
})
|
|
|
|
// ===== Remote management =====
|
|
|
|
t.Run("remote_list_empty", func(t *testing.T) {
|
|
out := bdDolt(t, bd, dir, "remote", "list")
|
|
_ = out // Should succeed even with no remotes
|
|
})
|
|
|
|
t.Run("remote_add_and_list", func(t *testing.T) {
|
|
remoteDir := t.TempDir()
|
|
bdDolt(t, bd, dir, "remote", "add", "test-remote", "file://"+remoteDir)
|
|
out := bdDolt(t, bd, dir, "remote", "list")
|
|
if !strings.Contains(out, "test-remote") {
|
|
t.Errorf("expected 'test-remote' in remote list: %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("remote_remove", func(t *testing.T) {
|
|
bdDolt(t, bd, dir, "remote", "remove", "test-remote")
|
|
out := bdDolt(t, bd, dir, "remote", "list")
|
|
if strings.Contains(out, "test-remote") {
|
|
t.Errorf("expected 'test-remote' to be removed: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Push/Pull with file remote =====
|
|
|
|
t.Run("push_to_file_remote", func(t *testing.T) {
|
|
ppDir, _, _ := bdInit(t, bd, "--prefix", "pp")
|
|
|
|
remoteDir := t.TempDir()
|
|
bdDolt(t, bd, ppDir, "remote", "add", "origin", "file://"+remoteDir)
|
|
|
|
// Create an issue and commit
|
|
bdCreate(t, bd, ppDir, "Push roundtrip issue", "--type", "task")
|
|
bdDolt(t, bd, ppDir, "commit", "-m", "roundtrip commit")
|
|
|
|
// Push to file remote
|
|
bdDolt(t, bd, ppDir, "push")
|
|
})
|
|
|
|
t.Run("push_force", func(t *testing.T) {
|
|
pfDir, _, _ := bdInit(t, bd, "--prefix", "pf")
|
|
remoteDir := t.TempDir()
|
|
bdDolt(t, bd, pfDir, "remote", "add", "origin", "file://"+remoteDir)
|
|
|
|
bdCreate(t, bd, pfDir, "Force push issue", "--type", "task")
|
|
bdDolt(t, bd, pfDir, "commit", "-m", "force push commit")
|
|
bdDolt(t, bd, pfDir, "push", "--force")
|
|
})
|
|
|
|
t.Run("push_no_remote", func(t *testing.T) {
|
|
// Push without a remote should fail gracefully, not panic
|
|
cmd := exec.Command(bd, "dolt", "push")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Log("push without remote succeeded unexpectedly")
|
|
}
|
|
_ = out
|
|
})
|
|
|
|
t.Run("pull_no_remote", func(t *testing.T) {
|
|
cmd := exec.Command(bd, "dolt", "pull")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Log("pull without remote succeeded unexpectedly")
|
|
}
|
|
_ = out
|
|
})
|
|
|
|
// ===== Push/Pull between two repos via shared file remote =====
|
|
|
|
t.Run("push_then_push_more", func(t *testing.T) {
|
|
// Push twice to verify incremental pushes work
|
|
ppDir, _, _ := bdInit(t, bd, "--prefix", "pm")
|
|
remoteDir := t.TempDir()
|
|
bdDolt(t, bd, ppDir, "remote", "add", "origin", "file://"+remoteDir)
|
|
|
|
// First push
|
|
bdCreate(t, bd, ppDir, "First push issue", "--type", "task")
|
|
bdDolt(t, bd, ppDir, "commit", "-m", "first commit")
|
|
bdDolt(t, bd, ppDir, "push")
|
|
|
|
// Second push
|
|
bdCreate(t, bd, ppDir, "Second push issue", "--type", "task")
|
|
bdDolt(t, bd, ppDir, "commit", "-m", "second commit")
|
|
bdDolt(t, bd, ppDir, "push")
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedDoltConcurrent exercises dolt operations concurrently.
|
|
func TestEmbeddedDoltConcurrent(t *testing.T) {
|
|
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
|
|
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt integration tests")
|
|
}
|
|
t.Parallel()
|
|
|
|
bd := buildEmbeddedBD(t)
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "dx")
|
|
|
|
// Pre-create issues so commits have something to work with
|
|
for i := 0; i < 4; i++ {
|
|
bdCreate(t, bd, dir, fmt.Sprintf("dolt-concurrent-%d", i), "--type", "task")
|
|
}
|
|
|
|
const numWorkers = 8
|
|
|
|
type workerResult struct {
|
|
worker int
|
|
err error
|
|
}
|
|
|
|
results := make([]workerResult, numWorkers)
|
|
var wg sync.WaitGroup
|
|
wg.Add(numWorkers)
|
|
|
|
for w := 0; w < numWorkers; w++ {
|
|
go func(worker int) {
|
|
defer wg.Done()
|
|
r := workerResult{worker: worker}
|
|
|
|
var args []string
|
|
expectFail := false
|
|
switch worker % 3 {
|
|
case 0:
|
|
args = []string{"dolt", "commit"}
|
|
case 1:
|
|
// Status is an embedded-mode inspection command.
|
|
args = []string{"dolt", "status"}
|
|
case 2:
|
|
// Server-only command should fail fast.
|
|
args = []string{"dolt", "start"}
|
|
expectFail = true
|
|
}
|
|
|
|
cmd := exec.Command(bd, args...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
|
|
if expectFail {
|
|
if err == nil {
|
|
r.err = fmt.Errorf("expected dolt %s to fail in embedded mode", args[1])
|
|
} else if !strings.Contains(string(out), "not supported in embedded mode") {
|
|
r.err = fmt.Errorf("unexpected error from dolt %s: %s", args[1], out)
|
|
}
|
|
} else {
|
|
if err != nil {
|
|
r.err = fmt.Errorf("dolt %s (worker %d): %v\n%s", strings.Join(args[1:], " "), worker, err, out)
|
|
}
|
|
}
|
|
|
|
results[worker] = r
|
|
}(w)
|
|
}
|
|
wg.Wait()
|
|
|
|
for _, r := range results {
|
|
if r.err != nil && !strings.Contains(r.err.Error(), "one writer at a time") {
|
|
t.Errorf("worker %d failed: %v", r.worker, r.err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestAdminEmbeddedBlocked verifies that bd admin subcommands are blocked in
|
|
// embedded mode. The guard was previously on adminCmd.PersistentPreRunE which
|
|
// fired before cmdCtx.ServerMode was populated, causing a false "embedded mode"
|
|
// error even in server-mode projects. The guard is now inside each subcommand's
|
|
// Run func, after store init. This test ensures embedded mode still correctly
|
|
// rejects admin commands.
|
|
func TestAdminEmbeddedBlocked(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skipping integration test in short mode")
|
|
}
|
|
t.Parallel()
|
|
|
|
bd := buildEmbeddedBD(t)
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "ta")
|
|
|
|
blockedCmds := []struct {
|
|
name string
|
|
args []string
|
|
}{
|
|
{"compact --dolt", []string{"admin", "compact", "--dolt"}},
|
|
{"cleanup --dry-run", []string{"admin", "cleanup", "--dry-run"}},
|
|
{"reset", []string{"admin", "reset"}},
|
|
}
|
|
|
|
for _, tc := range blockedCmds {
|
|
tc := tc
|
|
t.Run("blocked_"+tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
cmd := exec.Command(bd, tc.args...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Errorf("bd %s should fail in embedded mode but succeeded: %s", tc.name, out)
|
|
return
|
|
}
|
|
if !strings.Contains(string(out), "not yet supported in embedded mode") {
|
|
t.Errorf("bd %s: expected 'not yet supported in embedded mode', got: %s", tc.name, out)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestAdminEmbeddedCompactReadOnlyAllowed verifies read-only compact modes are
|
|
// not blocked by the embedded-mode admin guard.
|
|
func TestAdminEmbeddedCompactReadOnlyAllowed(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skipping integration test in short mode")
|
|
}
|
|
t.Parallel()
|
|
|
|
bd := buildEmbeddedBD(t)
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "ta")
|
|
|
|
readOnlyCmds := []struct {
|
|
name string
|
|
args []string
|
|
}{
|
|
{"compact --stats", []string{"admin", "compact", "--stats"}},
|
|
{"compact --dolt --dry-run", []string{"admin", "compact", "--dolt", "--dry-run"}},
|
|
}
|
|
|
|
for _, tc := range readOnlyCmds {
|
|
tc := tc
|
|
t.Run("allowed_"+tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
cmd := exec.Command(bd, tc.args...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Errorf("bd %s should be allowed in embedded mode: %v\n%s", tc.name, err, out)
|
|
return
|
|
}
|
|
if strings.Contains(string(out), "not yet supported in embedded mode") {
|
|
t.Errorf("bd %s hit embedded-mode guard unexpectedly: %s", tc.name, out)
|
|
}
|
|
})
|
|
}
|
|
}
|