Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkg/test/extensions/binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,22 @@ func (binaries TestBinaries) ListTests(ctx context.Context, parallelism int, env
return nil, fmt.Errorf("encountered errors while listing tests: %s", strings.Join(errs, ";"))
}

var baseSpecs extensiontests.ExtensionTestSpecs
for _, spec := range allTests {
baseSpecs = append(baseSpecs, spec.ExtensionTestSpec)
}

// Save current binary-registered name before any origin-side mutations.
// External binaries only recognize the name they registered, not names
// modified by addLabelsToSpecs/addEnvironmentSelectors/appendSuiteNames.
for _, spec := range baseSpecs {
spec.OriginalName = spec.Name
}
baseSpecs = filterOutDisabledSpecs(baseSpecs)
addEnvironmentSelectors(baseSpecs)
addLabelsToSpecs(baseSpecs)
appendSuiteNames(baseSpecs)

return allTests, nil
}

Expand Down
6 changes: 5 additions & 1 deletion pkg/test/ginkgo/test_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,11 @@ func (c *commandContext) RunTestInNewProcess(ctx context.Context, test *testCase
timeout = test.testTimeout
}

results := test.binary.RunTests(ctx, timeout, testEnv, test.name)
dispatchName := test.rawName
if dispatchName == "" {
dispatchName = test.name
}
results := test.binary.RunTests(ctx, timeout, testEnv, dispatchName)
if len(results) != 1 {
fmt.Fprintf(os.Stderr, "warning: expected 1 result from external binary; received %d", len(results))
}
Expand Down
6 changes: 5 additions & 1 deletion pkg/test/ginkgo/test_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ var re = regexp.MustCompile(`.*\[Timeout:(.[^\]]*)\]`)
func extensionTestSpecsToOriginTestCases(specs extensions.ExtensionTestSpecs) ([]*testCase, error) {
var tests []*testCase
for _, spec := range specs {
rawName := spec.Name
if spec.OriginalName != "" {
rawName = spec.OriginalName
}
tc := &testCase{
name: spec.Name,
rawName: spec.Name,
rawName: rawName,
binary: spec.Binary,
spec: spec,
}
Expand Down