fix: resolve CI failures on main (6 tests, formatting)
- Fix gofmt: remove trailing blank lines in 4 files - Skip TestOpenFromConfig_Embedded/DefaultsToEmbedded when no Dolt server (these tests connect to 127.0.0.1:3307 which is unavailable in CI) - Add CheckGitConflicts to collectValidateChecks (was missing, causing TestValidateCheck_DetectsGitConflicts to fail) - Implement CheckGitConflicts for CGO builds (scans JSONL for conflict markers; only no-cgo stub existed) - Fix TestIssueContentSize expected value: "some long description text" is 26 chars, not 25 - Fix TestAppend_CreatesFileAndWritesJSONL: create metadata.json instead of issues.jsonl so hasBeadsProjectFiles recognizes the BEADS_DIR Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Executed-By: beads/refinery Rig: beads Role: refinery
This commit is contained in:
parent
c879f338b7
commit
041b74b54a
8 changed files with 89 additions and 10 deletions
|
|
@ -9,6 +9,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/beads"
|
||||
)
|
||||
|
|
@ -20,6 +21,15 @@ func skipIfNoDolt(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func skipIfNoDoltServer(t *testing.T) {
|
||||
t.Helper()
|
||||
conn, err := net.DialTimeout("tcp", "127.0.0.1:3307", 200*time.Millisecond)
|
||||
if err != nil {
|
||||
t.Skip("Dolt server not running on 127.0.0.1:3307, skipping test")
|
||||
}
|
||||
_ = conn.Close()
|
||||
}
|
||||
|
||||
func TestOpen(t *testing.T) {
|
||||
skipIfNoDolt(t)
|
||||
|
||||
|
|
@ -53,6 +63,10 @@ func TestFindBeadsDir(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestOpenFromConfig_Embedded(t *testing.T) {
|
||||
// This test requires a running Dolt server (embedded mode is not yet implemented;
|
||||
// New() always connects via MySQL protocol to dolt sql-server).
|
||||
skipIfNoDoltServer(t)
|
||||
|
||||
// Create a .beads dir with metadata.json configured for embedded mode
|
||||
tmpDir := t.TempDir()
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
|
|
@ -78,6 +92,10 @@ func TestOpenFromConfig_Embedded(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestOpenFromConfig_DefaultsToEmbedded(t *testing.T) {
|
||||
// This test requires a running Dolt server (embedded mode is not yet implemented;
|
||||
// New() always connects via MySQL protocol to dolt sql-server).
|
||||
skipIfNoDoltServer(t)
|
||||
|
||||
// metadata.json without dolt_mode should default to embedded
|
||||
tmpDir := t.TempDir()
|
||||
beadsDir := filepath.Join(tmpDir, ".beads")
|
||||
|
|
|
|||
|
|
@ -621,7 +621,6 @@ func runDiagnostics(path string) doctorResult {
|
|||
result.Checks = append(result.Checks, pollutionCheck)
|
||||
// Don't fail overall check for test pollution, just warn
|
||||
|
||||
|
||||
// Check 26: Stale closed issues (maintenance)
|
||||
staleClosedCheck := convertDoctorCheck(doctor.CheckStaleClosedIssues(path))
|
||||
result.Checks = append(result.Checks, staleClosedCheck)
|
||||
|
|
|
|||
|
|
@ -169,4 +169,3 @@ func CheckUntrackedBeadsFiles(path string) DoctorCheck {
|
|||
func FixPermissions(path string) error {
|
||||
return fix.Permissions(path)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -325,6 +325,70 @@ func CheckTestPollution(path string) DoctorCheck {
|
|||
}
|
||||
}
|
||||
|
||||
// CheckGitConflicts detects unresolved git merge conflict markers in JSONL files.
|
||||
func CheckGitConflicts(path string) DoctorCheck {
|
||||
beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
|
||||
|
||||
if _, err := os.Stat(beadsDir); os.IsNotExist(err) {
|
||||
return DoctorCheck{
|
||||
Name: "Git Conflicts",
|
||||
Status: StatusOK,
|
||||
Message: "N/A (no .beads directory)",
|
||||
}
|
||||
}
|
||||
|
||||
// Scan all JSONL files for conflict markers
|
||||
matches, err := filepath.Glob(filepath.Join(beadsDir, "*.jsonl"))
|
||||
if err != nil || len(matches) == 0 {
|
||||
return DoctorCheck{
|
||||
Name: "Git Conflicts",
|
||||
Status: StatusOK,
|
||||
Message: "No JSONL files to check",
|
||||
}
|
||||
}
|
||||
|
||||
var conflictFiles []string
|
||||
for _, fpath := range matches {
|
||||
f, err := os.Open(fpath) // #nosec G304 - path constructed from beadsDir
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
scanner := bufio.NewScanner(f)
|
||||
hasConflict := false
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if strings.HasPrefix(line, "<<<<<<<") || strings.HasPrefix(line, ">>>>>>>") || strings.HasPrefix(line, "=======") {
|
||||
hasConflict = true
|
||||
break
|
||||
}
|
||||
}
|
||||
_ = f.Close()
|
||||
if hasConflict {
|
||||
if rel, err := filepath.Rel(beadsDir, fpath); err == nil {
|
||||
conflictFiles = append(conflictFiles, rel)
|
||||
} else {
|
||||
conflictFiles = append(conflictFiles, filepath.Base(fpath))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(conflictFiles) == 0 {
|
||||
return DoctorCheck{
|
||||
Name: "Git Conflicts",
|
||||
Status: StatusOK,
|
||||
Message: "No conflict markers found",
|
||||
}
|
||||
}
|
||||
|
||||
return DoctorCheck{
|
||||
Name: "Git Conflicts",
|
||||
Status: StatusError,
|
||||
Message: fmt.Sprintf("Unresolved git conflicts in %d file(s)", len(conflictFiles)),
|
||||
Detail: strings.Join(conflictFiles, ", "),
|
||||
Fix: "Resolve merge conflicts in .beads/ files, then commit",
|
||||
}
|
||||
}
|
||||
|
||||
// CheckChildParentDependencies detects child→parent blocking dependencies.
|
||||
// These often indicate a modeling mistake (deadlock: child waits for parent, parent waits for children).
|
||||
// However, they may be intentional in some workflows, so removal requires explicit opt-in.
|
||||
|
|
@ -392,4 +456,3 @@ func CheckChildParentDependencies(path string) DoctorCheck {
|
|||
Category: CategoryMetadata,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ func collectValidateChecks(path string) []validateCheckResult {
|
|||
{check: convertDoctorCheck(doctor.CheckDuplicateIssues(path, doctorGastown, gastownDuplicatesThreshold))},
|
||||
{check: convertDoctorCheck(doctor.CheckOrphanedDependencies(path)), fixable: true},
|
||||
{check: convertDoctorCheck(doctor.CheckTestPollution(path))},
|
||||
{check: convertDoctorCheck(doctor.CheckGitConflicts(path))},
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ func TestIssueContentSize(t *testing.T) {
|
|||
issue: &types.Issue{
|
||||
Description: "some long description text",
|
||||
},
|
||||
want: 25,
|
||||
want: 26,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ func TestAppend_CreatesFileAndWritesJSONL(t *testing.T) {
|
|||
if err := os.MkdirAll(beadsDir, 0750); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
// beads.FindBeadsDir() validates that the directory contains project files
|
||||
// (db or *.jsonl). Create an empty issues.jsonl so BEADS_DIR is accepted.
|
||||
issuesPath := filepath.Join(beadsDir, "issues.jsonl")
|
||||
if err := os.WriteFile(issuesPath, []byte{}, 0644); err != nil {
|
||||
t.Fatalf("write issues.jsonl: %v", err)
|
||||
// beads.FindBeadsDir() validates that the directory contains project files.
|
||||
// Create metadata.json so BEADS_DIR is accepted by hasBeadsProjectFiles.
|
||||
metadataPath := filepath.Join(beadsDir, "metadata.json")
|
||||
if err := os.WriteFile(metadataPath, []byte(`{"backend":"dolt"}`), 0644); err != nil {
|
||||
t.Fatalf("write metadata.json: %v", err)
|
||||
}
|
||||
t.Setenv("BEADS_DIR", beadsDir)
|
||||
|
||||
|
|
|
|||
|
|
@ -1218,4 +1218,3 @@ func (s *DoltStore) GetNextChildID(ctx context.Context, parentID string) (string
|
|||
|
||||
return fmt.Sprintf("%s.%d", parentID, nextChild), nil
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue