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

-

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

35
acceptance/acceptance_test.go
View File

@ -199,7 +199,20 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
tmpDir = t.TempDir() tmpDir = t.TempDir()
} }
cmdEnv := os.Environ() repls.SetPathWithParents(tmpDir, "$TMPDIR")
repls.Repls = append(repls.Repls, config.Repls...)
scriptContents := readMergedScriptContents(t, dir)
testutil.WriteFile(t, filepath.Join(tmpDir, EntryPointScript), scriptContents)
inputs := make(map[string]bool, 2)
outputs := make(map[string]bool, 2)
err = CopyDir(dir, tmpDir, inputs, outputs)
require.NoError(t, err)
args := []string{"bash", "-euo", "pipefail", EntryPointScript}
cmd := exec.Command(args[0], args[1:]...)
cmd.Env = os.Environ()
// Start a new server with a custom configuration if the acceptance test // Start a new server with a custom configuration if the acceptance test
// specifies a custom server stubs. // specifies a custom server stubs.
@ -214,22 +227,9 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
return b, nil return b, nil
}) })
} }
cmdEnv = append(cmdEnv, "DATABRICKS_HOST="+server.URL) cmd.Env = append(cmd.Env, "DATABRICKS_HOST="+server.URL)
} }
repls.SetPathWithParents(tmpDir, "$TMPDIR")
repls.Repls = append(repls.Repls, config.Repls...)
scriptContents := readMergedScriptContents(t, dir)
testutil.WriteFile(t, filepath.Join(tmpDir, EntryPointScript), scriptContents)
inputs := make(map[string]bool, 2)
outputs := make(map[string]bool, 2)
err = CopyDir(dir, tmpDir, inputs, outputs)
require.NoError(t, err)
args := []string{"bash", "-euo", "pipefail", EntryPointScript}
cmd := exec.Command(args[0], args[1:]...)
if coverDir != "" { if coverDir != "" {
// Creating individual coverage directory for each test, because writing to the same one // Creating individual coverage directory for each test, because writing to the same one
// results in sporadic failures like this one (only if tests are running in parallel): // results in sporadic failures like this one (only if tests are running in parallel):
@ -237,12 +237,9 @@ 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)
cmdEnv = append(cmdEnv, "GOCOVERDIR="+coverDir) cmd.Env = append(cmd.Env, "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)