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

Use ReplaceOutput function

This commit is contained in:
Pieter Noordhuis 2025-01-14 20:11:37 +01:00
parent a52032a1c0
commit 36c08d3cc5
No known key found for this signature in database
GPG Key ID: 12ACCCC104CF2930
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
acceptance/acceptance_test.go
View File

@ -56,9 +56,6 @@ func TestAccept(t *testing.T) {
// Make helper scripts available // Make helper scripts available
t.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(cwd, "bin"), os.PathListSeparator, os.Getenv("PATH"))) t.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(cwd, "bin"), os.PathListSeparator, os.Getenv("PATH")))
repls := testdiff.ReplacementsContext{}
repls.Set(execPath, "$CLI")
ctx := context.Background() ctx := context.Background()
cloudEnv := os.Getenv("CLOUD_ENV") cloudEnv := os.Getenv("CLOUD_ENV")
@ -80,8 +77,11 @@ func TestAccept(t *testing.T) {
user, err := workspaceClient.CurrentUser.Me(ctx) user, err := workspaceClient.CurrentUser.Me(ctx)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, user) require.NotNil(t, user)
testdiff.PrepareReplacementsUser(t, &repls, *user)
testdiff.PrepareReplacements(t, &repls, workspaceClient) ctx, repls := testdiff.WithReplacementsMap(ctx)
repls.Set(execPath, "$CLI")
testdiff.PrepareReplacementsUser(t, repls, *user)
testdiff.PrepareReplacements(t, repls, workspaceClient)
testDirs := getTests(t) testDirs := getTests(t)
require.NotEmpty(t, testDirs) require.NotEmpty(t, testDirs)
@ -89,7 +89,7 @@ func TestAccept(t *testing.T) {
for _, dir := range testDirs { for _, dir := range testDirs {
t.Run(dir, func(t *testing.T) { t.Run(dir, func(t *testing.T) {
t.Parallel() t.Parallel()
runTest(t, dir, coverDir, repls) runTest(t, ctx, dir, coverDir)
}) })
} }
} }
@ -114,7 +114,7 @@ func getTests(t *testing.T) []string {
return testDirs return testDirs
} }
func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsContext) { func runTest(t *testing.T, ctx context.Context, dir, coverDir string) {
var tmpDir string var tmpDir string
var err error var err error
if KeepTmp { if KeepTmp {
@ -150,7 +150,7 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
outB, err := cmd.CombinedOutput() outB, err := cmd.CombinedOutput()
out := formatOutput(string(outB), err) out := formatOutput(string(outB), err)
out = repls.Replace(out) out = testdiff.ReplaceOutput(t, ctx, out)
doComparison(t, filepath.Join(dir, "output.txt"), "script output", out) doComparison(t, filepath.Join(dir, "output.txt"), "script output", out)
for relPath := range outputs { for relPath := range outputs {
@ -169,7 +169,7 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
continue continue
} }
pathExpected := filepath.Join(dir, relPath) pathExpected := filepath.Join(dir, relPath)
newVal := repls.Replace(string(newValBytes)) newVal := testdiff.ReplaceOutput(t, ctx, string(newValBytes))
doComparison(t, pathExpected, pathNew, newVal) doComparison(t, pathExpected, pathNew, newVal)
} }
@ -190,7 +190,7 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
// Show the contents & support overwrite mode for it: // Show the contents & support overwrite mode for it:
pathNew := filepath.Join(tmpDir, relPath) pathNew := filepath.Join(tmpDir, relPath)
newVal := testutil.ReadFile(t, pathNew) newVal := testutil.ReadFile(t, pathNew)
newVal = repls.Replace(newVal) newVal = testdiff.ReplaceOutput(t, ctx, newVal)
doComparison(t, filepath.Join(dir, relPath), filepath.Join(tmpDir, relPath), newVal) doComparison(t, filepath.Join(dir, relPath), filepath.Join(tmpDir, relPath), newVal)
} }
} }