diff --git a/.github/scripts/proxied-cmd-test-shards.txt b/.github/scripts/proxied-cmd-test-shards.txt index 13bb27dd8..66175781b 100644 --- a/.github/scripts/proxied-cmd-test-shards.txt +++ b/.github/scripts/proxied-cmd-test-shards.txt @@ -62,3 +62,30 @@ 8 8 TestProxiedServerReopenConcurrent 8 8 TestProxiedServerDoltRemoteRemove 8 8 TestProxiedServerChildren + +# Parity-suite proxied tests (added with the cmd/bd embedded-parity port). +# Balanced by subtest count; shard 1 stays TestProxiedServerUpdate-only. + +8 2 TestProxiedServerDeferUndefer +8 2 TestProxiedServerFindDuplicates +8 2 TestProxiedServerStatus + +8 3 TestProxiedServerHistory +8 3 TestProxiedServerTypes +8 3 TestProxiedServerUnclaim + +8 4 TestProxiedServerEpic +8 4 TestProxiedServerSetState +8 4 TestProxiedServerStale + +8 5 TestProxiedServerCount +8 5 TestProxiedServerCountIncludeInfra +8 5 TestProxiedServerDuplicates + +8 6 TestProxiedServerOrphans +8 6 TestProxiedServerStatuses + +8 7 TestProxiedServerGraph +8 7 TestProxiedServerInfo +8 7 TestProxiedServerLint +8 7 TestProxiedServerReclaim diff --git a/cmd/bd/count_proxied_integration_test.go b/cmd/bd/count_proxied_integration_test.go index 5acd5bbf0..f5491fd1b 100644 --- a/cmd/bd/count_proxied_integration_test.go +++ b/cmd/bd/count_proxied_integration_test.go @@ -4,10 +4,8 @@ package main import ( "encoding/json" - "fmt" "strconv" "strings" - "sync" "testing" ) @@ -551,73 +549,3 @@ func TestProxiedServerCountIncludeInfra(t *testing.T) { } }) } - -// TestProxiedServerCountConcurrent exercises count operations concurrently -// through the proxied server. -func TestProxiedServerCountConcurrent(t *testing.T) { - requireSharedProxiedServer(t) - t.Parallel() - bd := buildEmbeddedBD(t) - p := newSharedProxiedProject(t, bd, "ccc") - - for i := 0; i < 20; i++ { - args := []string{fmt.Sprintf("concurrent-count-%d", i), "--type", "task"} - if i%2 == 0 { - args = append(args, "--assignee", "alice") - } else { - args = append(args, "--assignee", "bob") - } - if i%3 == 0 { - args = append(args, "--priority", "1") - } - bdProxiedCreate(t, bd, p.dir, args...) - } - - const numWorkers = 8 - - type workerResult struct { - worker int - err error - } - - results := make([]workerResult, numWorkers) - var wg sync.WaitGroup - wg.Add(numWorkers) - - queries := [][]string{ - {}, - {"--status", "open"}, - {"--assignee", "alice"}, - {"--type", "task"}, - {"--by-status"}, - {"--by-assignee"}, - {"--by-priority"}, - {"--priority", "1"}, - } - - for w := 0; w < numWorkers; w++ { - go func(worker int) { - defer wg.Done() - r := workerResult{worker: worker} - q := queries[worker%len(queries)] - out, err := bdProxiedRun(t, bd, p.dir, append([]string{"count", "--json"}, q...)...) - if err != nil { - r.err = fmt.Errorf("worker %d count %v: %v\n%s", worker, q, err, out) - results[worker] = r - return - } - var m map[string]interface{} - if err := json.Unmarshal(out, &m); err != nil { - r.err = fmt.Errorf("worker %d: JSON parse: %v\n%s", 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) - } - } -} diff --git a/cmd/bd/info_proxied_integration_test.go b/cmd/bd/info_proxied_integration_test.go index ddcd51493..82496375c 100644 --- a/cmd/bd/info_proxied_integration_test.go +++ b/cmd/bd/info_proxied_integration_test.go @@ -4,9 +4,7 @@ package main import ( "encoding/json" - "fmt" "strings" - "sync" "testing" ) @@ -161,61 +159,3 @@ func TestProxiedServerInfo(t *testing.T) { } }) } - -// TestProxiedServerInfoConcurrent exercises info operations concurrently -// through the proxied server. -func TestProxiedServerInfoConcurrent(t *testing.T) { - requireSharedProxiedServer(t) - t.Parallel() - bd := buildEmbeddedBD(t) - p := newSharedProxiedProject(t, bd, "ixc") - - for i := 0; i < 3; i++ { - bdProxiedCreate(t, bd, p.dir, fmt.Sprintf("info-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 - switch worker % 3 { - case 0: - args = []string{"info"} - case 1: - args = []string{"info", "--schema"} - case 2: - args = []string{"info", "--whats-new"} - } - out, err := bdProxiedRun(t, bd, p.dir, args...) - if err != nil { - r.err = fmt.Errorf("info (worker %d): %v\n%s", worker, err, out) - results[worker] = r - return - } - if len(strings.TrimSpace(string(out))) == 0 { - r.err = fmt.Errorf("info (worker %d): empty output", worker) - } - 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) - } - } -} diff --git a/cmd/bd/status_proxied_integration_test.go b/cmd/bd/status_proxied_integration_test.go index d649fb172..71d5edf1f 100644 --- a/cmd/bd/status_proxied_integration_test.go +++ b/cmd/bd/status_proxied_integration_test.go @@ -4,9 +4,7 @@ package main import ( "encoding/json" - "fmt" "strings" - "sync" "testing" ) @@ -194,64 +192,3 @@ func TestProxiedServerStatus(t *testing.T) { } }) } - -// TestProxiedServerStatusConcurrent exercises status operations concurrently -// through the proxied server. -func TestProxiedServerStatusConcurrent(t *testing.T) { - requireSharedProxiedServer(t) - t.Parallel() - bd := buildEmbeddedBD(t) - p := newSharedProxiedProject(t, bd, "ssc") - - for i := 0; i < 10; i++ { - bdProxiedCreate(t, bd, p.dir, fmt.Sprintf("concurrent-status-%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) - - queries := [][]string{ - {"--json"}, - {"--json", "--no-activity"}, - {"--json"}, - {"--json", "--no-activity"}, - {"--json"}, - {"--json"}, - {"--json", "--no-activity"}, - {"--json"}, - } - - for w := 0; w < numWorkers; w++ { - go func(worker int) { - defer wg.Done() - r := workerResult{worker: worker} - q := queries[worker%len(queries)] - out, err := bdProxiedRun(t, bd, p.dir, append([]string{"status"}, q...)...) - if err != nil { - r.err = fmt.Errorf("worker %d status %v: %v\n%s", worker, q, err, out) - results[worker] = r - return - } - var m map[string]interface{} - if err := json.Unmarshal(out, &m); err != nil { - r.err = fmt.Errorf("worker %d: JSON parse: %v\n%s", 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) - } - } -}