Skip to content

acc: Don't auto-enable -subset when -run specifies a variant #4837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 1 commit into from
Mar 25, 2026
Merged

acc: Don't auto-enable -subset when -run specifies a variant #4837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func init() {
// to simulate an identical environment.
flag.BoolVar(&WorkspaceTmpDir, "workspace-tmp-dir", false, "Run tests on the workspace file system (For DBR testing).")
flag.BoolVar(&OnlyOutTestToml, "only-out-test-toml", false, "Only regenerate out.test.toml files without running tests")
flag.BoolVar(&Subset, "subset", false, "Select a subset of EnvMatrix variants that cover all output files. Auto-enabled on -update.")
flag.BoolVar(&Subset, "subset", false, "Select a subset of EnvMatrix variants that cover all output files. Auto-enabled on -update (unless -run specifies a variant with '=').")
}

const (
Expand Down Expand Up @@ -179,8 +179,15 @@ func anyHelperScriptUsesEngine(dir string) bool {
return result
}

// hasRunFilter returns true if the -run flag contains '=', indicating a specific
// EnvMatrix variant was requested (e.g. DATABRICKS_BUNDLE_ENGINE=direct).
func hasRunFilter() bool {
f := flag.Lookup("test.run")
return f != nil && strings.Contains(f.Value.String(), "=")
}

func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
if testdiff.OverwriteMode {
if testdiff.OverwriteMode && !hasRunFilter() {
Subset = true
}

Expand Down