rename RequireOutput to AssertOutput

databricks · Dec 20, 2024 · abcf45d · abcf45d
1 parent ca24b15
commit abcf45d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/integration/bundle/init_default_python_test.go b/integration/bundle/init_default_python_test.go
@@ -88,17 +88,17 @@ func testDefaultPython(t *testing.T, pythonVersion string) {
 	err = os.WriteFile(filepath.Join(tmpDir, "config.json"), b, 0o644)
 	require.NoError(t, err)
 
-	testcli.RequireOutput(t, ctx, []string{"bundle", "init", "default-python", "--config-file", "config.json"}, "testdata/default_python/bundle_init.txt")
+	testcli.AssertOutput(t, ctx, []string{"bundle", "init", "default-python", "--config-file", "config.json"}, "testdata/default_python/bundle_init.txt")
 	testutil.Chdir(t, projectName)
 
-	testcli.RequireOutput(t, ctx, []string{"bundle", "validate"}, "testdata/default_python/bundle_validate.txt")
-
-	testcli.RequireOutput(t, ctx, []string{"bundle", "deploy"}, "testdata/default_python/bundle_deploy.txt")
 	t.Cleanup(func() {
 		// Delete the stack
 		testcli.RequireSuccessfulRun(t, ctx, "bundle", "destroy", "--auto-approve")
 	})
 
+	testcli.AssertOutput(t, ctx, []string{"bundle", "validate"}, "testdata/default_python/bundle_validate.txt")
+	testcli.AssertOutput(t, ctx, []string{"bundle", "deploy"}, "testdata/default_python/bundle_deploy.txt")
+
 	ignoredFields := []string{
 		"/bundle/terraform/exec_path",
 		"/resources/jobs/project_name_$UNIQUE_PRJ_job/email_notifications",
@@ -108,6 +108,5 @@ func testDefaultPython(t *testing.T, pythonVersion string) {
 		"/resources/pipelines/project_name_$UNIQUE_PRJ_pipeline/url",
 		"/workspace/current_user",
 	}
-
-	testcli.RequireOutputJQ(t, ctx, []string{"bundle", "summary", "--output", "json"}, "testdata/default_python/bundle_summary.txt", ignoredFields)
+	testcli.AssertOutputJQ(t, ctx, []string{"bundle", "summary", "--output", "json"}, "testdata/default_python/bundle_summary.txt", ignoredFields)
 }
diff --git a/internal/testcli/golden.go b/internal/testcli/golden.go
@@ -16,7 +16,7 @@ import (
 	"github.com/databricks/cli/libs/testdiff"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/service/iam"
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 var OverwriteMode = os.Getenv("TESTS_OUTPUT") == "OVERWRITE"
@@ -26,7 +26,7 @@ func ReadFile(t testutil.TestingT, ctx context.Context, filename string) string
 	if os.IsNotExist(err) {
 		return ""
 	}
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	// On CI, on Windows \n in the file somehow end up as \r\n
 	return NormalizeNewlines(string(data))
 }
@@ -35,18 +35,18 @@ func captureOutput(t testutil.TestingT, ctx context.Context, args []string) stri
 	t.Logf("run args: [%s]", strings.Join(args, ", "))
 	r := NewRunner(t, ctx, args...)
 	stdout, stderr, err := r.Run()
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	out := stderr.String() + stdout.String()
 	return ReplaceOutput(t, ctx, out)
 }
 
 func WriteFile(t testutil.TestingT, filename, data string) {
 	t.Logf("Overwriting %s", filename)
 	err := os.WriteFile(filename, []byte(data), 0o644)
-	require.NoError(t, err)
+	assert.NoError(t, err)
 }
 
-func RequireOutput(t testutil.TestingT, ctx context.Context, args []string, expectedFilename string) {
+func AssertOutput(t testutil.TestingT, ctx context.Context, args []string, expectedFilename string) {
 	_, filename, _, _ := runtime.Caller(1)
 	dir := filepath.Dir(filename)
 	expectedPath := filepath.Join(dir, expectedFilename)
@@ -64,7 +64,7 @@ func RequireOutput(t testutil.TestingT, ctx context.Context, args []string, expe
 	}
 }
 
-func RequireOutputJQ(t testutil.TestingT, ctx context.Context, args []string, expectedFilename string, ignorePaths []string) {
+func AssertOutputJQ(t testutil.TestingT, ctx context.Context, args []string, expectedFilename string, ignorePaths []string) {
 	_, filename, _, _ := runtime.Caller(1)
 	dir := filepath.Dir(filename)
 	expectedPath := filepath.Join(dir, expectedFilename)