Move SkipOnDbr check below ForceRun (#3552)

shreyas-goenka · web-flow · commit 226c6687ee5f · 2025-09-04T14:19:47.000Z
Fixes issue flagged in https://github.com/databricks/cli/pull/3527/files#r2321881715
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -411,14 +411,14 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
 		return "Disabled via SkipLocal setting in " + configPath
 	}
 
-	if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {
-		return "Disabled via SkipOnDbr setting in " + configPath
-	}
-
 	if Forcerun {
 		return ""
 	}
 
+	if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {
+		return "Disabled via SkipOnDbr setting in " + configPath
+	}
+
 	if isTruePtr(config.Slow) && testing.Short() {
 		return "Disabled via Slow setting in " + configPath
 	}

Original file line number	Diff line number	Diff line change
`@@ -411,14 +411,14 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {`
`411`	`411`	`return "Disabled via SkipLocal setting in " + configPath`
`412`	`412`	`}`
`413`	`413`
`414`		`- if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {`
`415`		`- return "Disabled via SkipOnDbr setting in " + configPath`
`416`		`- }`
`417`		`-`
`418`	`414`	`if Forcerun {`
`419`	`415`	`return ""`
`420`	`416`	`}`
`421`	`417`
	`418`	`+ if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {`
	`419`	`+ return "Disabled via SkipOnDbr setting in " + configPath`
	`420`	`+ }`
	`421`	`+`
`422`	`422`	`if isTruePtr(config.Slow) && testing.Short() {`
`423`	`423`	`return "Disabled via Slow setting in " + configPath`
`424`	`424`	`}`