Merge pull request #28 from segmentio/yolken-update-diff-test

Improve diff test

Author: yolken-segment

cmd/kubeapply/subcmd/diff_test.go

@@ -2,8 +2,12 @@ package subcmd
 
 import (
 	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
+	"time"
 
 	"github.com/segmentio/kubeapply/pkg/util"
 	"github.com/stretchr/testify/require"
@@ -16,13 +20,33 @@ func TestDiff(t *testing.T) {
 
 	ctx := context.Background()
 
-	testClusterDir := "testdata/clusters/basic"
+	namespace := fmt.Sprintf("test-diff-%d", time.Now().UnixNano()/1000)
+	util.CreateNamespace(ctx, t, namespace, kubeConfigTestPath)
 
+	tempDir, err := ioutil.TempDir("", "diff")
+	require.Nil(t, err)
+	defer os.RemoveAll(tempDir)
+
+	clusterDir := filepath.Join(tempDir, "cluster")
+	require.Nil(t, err)
+
+	err = util.RecursiveCopy("testdata/clusters/apply-test", clusterDir)
+	require.Nil(t, err)
+	replaceNamespace(t, filepath.Join(clusterDir, "expanded"), namespace)
+
+	// Full outputs
 	diffFlagValues.kubeConfig = kubeConfigTestPath
+	err = diffClusterPath(
+		ctx,
+		filepath.Join(clusterDir, "cluster.yaml"),
+	)
+	require.Nil(t, err)
 
-	err := diffClusterPath(
+	// Simple outputs
+	diffFlagValues.simpleOutput = true
+	err = diffClusterPath(
 		ctx,
-		filepath.Join(testClusterDir, "cluster.yaml"),
+		filepath.Join(clusterDir, "cluster.yaml"),
 	)
 	require.Nil(t, err)
 }