steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow override test to run in parallel

This commit is contained in:
Shreyas Goenka 2025-01-29 12:08:33 +01:00
parent af6ae9c14a
commit 7c5d65feb1
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
acceptance/acceptance_test.go
View File

@ -146,7 +146,7 @@ func testAccept(t *testing.T, InprocessMode bool, singleTest string) int {
for _, dir := range testDirs { for _, dir := range testDirs {
testName := strings.ReplaceAll(dir, "\\", "/") testName := strings.ReplaceAll(dir, "\\", "/")
t.Run(testName, func(t *testing.T) { t.Run(testName, func(t *testing.T) {
if !InprocessMode && !hasCustomServer(t, dir) { if !InprocessMode {
t.Parallel() t.Parallel()
} }
@ -157,10 +157,6 @@ func testAccept(t *testing.T, InprocessMode bool, singleTest string) int {
return len(testDirs) return len(testDirs)
} }
func hasCustomServer(t *testing.T, dir string) bool {
return testutil.DetectFile(t, filepath.Join(dir, "server.json"))
}
func getTests(t *testing.T) []string { func getTests(t *testing.T) []string {
testDirs := make([]string, 0, 128) testDirs := make([]string, 0, 128)
@ -181,6 +177,16 @@ func getTests(t *testing.T) []string {
return testDirs return testDirs
} }
func setEnv(env []string, key, value string) []string {
for i, pair := range env {
if strings.HasPrefix(pair, key+"=") {
env[i] = key + "=" + value
return env
}
}
return append(env, key+"="+value)
}
func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsContext) { func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsContext) {
config, configPath := LoadConfig(t, dir) config, configPath := LoadConfig(t, dir)
@ -201,11 +207,13 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
tmpDir = t.TempDir() tmpDir = t.TempDir()
} }
cmdEnv := os.Environ()
// If there is a server.json file in the test directory, start a custom server. // If there is a server.json file in the test directory, start a custom server.
// Redirect all API calls to this server. // Redirect all API calls to this server.
if hasCustomServer(t, dir) { if testutil.DetectFile(t, filepath.Join(dir, "server.json")) {
server := testserver.NewFromConfig(t, filepath.Join(dir, "server.json")) server := testserver.NewFromConfig(t, filepath.Join(dir, "server.json"))
t.Setenv("DATABRICKS_HOST", server.URL) cmdEnv = setEnv(cmdEnv, "DATABRICKS_HOST", server.URL)
t.Cleanup(func() { t.Cleanup(func() {
server.Close() server.Close()
}) })
@ -231,9 +239,12 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
coverDir = filepath.Join(coverDir, strings.ReplaceAll(dir, string(os.PathSeparator), "--")) coverDir = filepath.Join(coverDir, strings.ReplaceAll(dir, string(os.PathSeparator), "--"))
err := os.MkdirAll(coverDir, os.ModePerm) err := os.MkdirAll(coverDir, os.ModePerm)
require.NoError(t, err) require.NoError(t, err)
cmd.Env = append(os.Environ(), "GOCOVERDIR="+coverDir) cmdEnv = setEnv(cmdEnv, "GOCOVERDIR", coverDir)
} }
// Set environment variables for the process
cmd.Env = cmdEnv
// Write combined output to a file // Write combined output to a file
out, err := os.Create(filepath.Join(tmpDir, "output.txt")) out, err := os.Create(filepath.Join(tmpDir, "output.txt"))
require.NoError(t, err) require.NoError(t, err)