Fix up the remaining tests.

Author: bigkevmcd

pkg/gitfs/gitfs_test.go

@@ -4,9 +4,10 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/go-git/go-git/v5"
 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/kustomize/pkg/fs"
+
+	"github.com/rhd-gitops-example/gitops-backend/test"
 )
 
 var _ fs.FileSystem = gitFS{}
@@ -105,9 +106,7 @@ func TestNewInMemoryFromOptions(t *testing.T) {
 func makeClonedGFS(t *testing.T) fs.FileSystem {
 	t.Helper()
 	gfs, err := NewInMemoryFromOptions(
-		&git.CloneOptions{
-			URL: "../../",
-		})
+		test.MakeCloneOptions())
 	assertNoError(t, err)
 	return gfs
 }

pkg/parser/parser_test.go

@@ -1,14 +1,14 @@
 package parser
 
 import (
-	"os"
 	"sort"
 	"strings"
 	"testing"
 
 	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/google/go-cmp/cmp"
+
+	"github.com/rhd-gitops-example/gitops-backend/test"
 )
 
 const (
@@ -39,7 +39,7 @@ func resKey(r *Resource) string {
 func TestParseFromGit(t *testing.T) {
 	res, err := ParseFromGit(
 		"pkg/parser/testdata/go-demo",
-		makeCloneOptions())
+		test.MakeCloneOptions())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -135,16 +135,3 @@ func assertCmp(t *testing.T, want, got interface{}, msg string) {
 		t.Fatalf(msg+":\n%s", diff)
 	}
 }
-
-// If running in Travis, ensure that it's using the correct branch.
-func makeCloneOptions() *git.CloneOptions {
-	o := &git.CloneOptions{
-		URL:   "../..",
-		Depth: 1,
-	}
-	if b := os.Getenv("TRAVIS_PULL_REQUEST_BRANCH"); b != "" {
-		o.ReferenceName = plumbing.NewBranchReferenceName(b)
-		o.URL = "https://github.com/rhd-gitops-example/gitops-backend.git"
-	}
-	return o
-}

test/clone_options.go

@@ -0,0 +1,22 @@
+package test
+
+import (
+	"os"
+
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+)
+
+// MakeCloneOptions determines if we are running in Travis,
+// and ensures that it's using the correct branch.
+func MakeCloneOptions() *git.CloneOptions {
+	o := &git.CloneOptions{
+		URL:   "../..",
+		Depth: 1,
+	}
+	if b := os.Getenv("TRAVIS_PULL_REQUEST_BRANCH"); b != "" {
+		o.ReferenceName = plumbing.NewBranchReferenceName(b)
+		o.URL = "https://github.com/rhd-gitops-example/gitops-backend.git"
+	}
+	return o
+}