fix dashboards_test.go - in one case we actually required to have an error

Author: denik

integration/bundle/dashboards_test.go

@@ -52,7 +52,8 @@ func TestDashboards(t *testing.T) {
 	require.NoError(t, err)
 
 	// Try to redeploy the bundle and confirm that the out of band modification is detected.
-	stdout, _ := deployBundleWithArgs(t, ctx, root)
+	stdout, _, err := deployBundleWithArgsErr(t, ctx, root)
+	require.Error(t, err)
 	assert.Contains(t, stdout, `Error: dashboard "file_reference" has been modified remotely`+"\n")
 
 	// Redeploy the bundle with the --force flag and confirm that the out of band modification is ignored.

integration/bundle/helpers_test.go

@@ -87,13 +87,18 @@ func deployBundle(t testutil.TestingT, ctx context.Context, path string) {
 	require.NoError(t, err)
 }
 
-func deployBundleWithArgs(t testutil.TestingT, ctx context.Context, path string, args ...string) (string, string) {
+func deployBundleWithArgsErr(t testutil.TestingT, ctx context.Context, path string, args ...string) (string, string, error) {
 	ctx = env.Set(ctx, "BUNDLE_ROOT", path)
 	args = append([]string{"bundle", "deploy"}, args...)
 	c := testcli.NewRunnerWithContext(t, ctx, args...)
 	stdout, stderr, err := c.Run()
+	return stdout.String(), stderr.String(), err
+}
+
+func deployBundleWithArgs(t testutil.TestingT, ctx context.Context, path string, args ...string) (string, string) {
+	stdout, stderr, err := deployBundleWithArgsErr(t, ctx, path, args...)
 	require.NoError(t, err)
-	return stdout.String(), stderr.String()
+	return stdout, stderr
 }
 
 func deployBundleWithFlags(t testutil.TestingT, ctx context.Context, path string, flags []string) {