Merge pull request #620 from jmank88/test_cleanup

gps tests: dry and cleanup; remove unused code

Author: sdboyer

internal/gps/deduce_test.go

@@ -587,21 +587,16 @@ func TestDeduceFromPath(t *testing.T) {
 			}
 		})
 	}
-	for typ, fixtures := range pathDeductionFixtures {
-		typ, fixtures := typ, fixtures
-		t.Run("first", func(t *testing.T) {
+	runSet := func(t *testing.T) {
+		for typ, fixtures := range pathDeductionFixtures {
 			do(typ, fixtures, t)
-		})
+		}
 	}
+	t.Run("first", runSet)
 
 	// Run the test set twice to ensure results are correct for both cached
 	// and uncached deductions.
-	for typ, fixtures := range pathDeductionFixtures {
-		typ, fixtures := typ, fixtures
-		t.Run("second", func(t *testing.T) {
-			do(typ, fixtures, t)
-		})
-	}
+	t.Run("second", runSet)
 }
 
 func TestVanityDeduction(t *testing.T) {

internal/gps/manager_test.go

@@ -16,12 +16,8 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
-
-	"github.com/Masterminds/semver"
 )
 
-var bd string
-
 // An analyzer that passes nothing back, but doesn't error. This is the naive
 // case - no constraints, no lock, and no errors. The SourceManager will
 // interpret this as open/Any constraints on everything in the import graph.
@@ -35,15 +31,6 @@ func (a naiveAnalyzer) Info() (name string, version int) {
 	return "naive-analyzer", 1
 }
 
-func sv(s string) semver.Version {
-	sv, err := semver.NewVersion(s)
-	if err != nil {
-		panic(fmt.Sprintf("Error creating semver from %q: %s", s, err))
-	}
-
-	return sv
-}
-
 func mkNaiveSM(t *testing.T) (*SourceMgr, func()) {
 	cpath, err := ioutil.TempDir("", "smcache")
 	if err != nil {
@@ -82,11 +69,6 @@ func remakeNaiveSM(osm *SourceMgr, t *testing.T) (*SourceMgr, func()) {
 	}
 }
 
-func init() {
-	_, filename, _, _ := runtime.Caller(1)
-	bd = path.Dir(filename)
-}
-
 func TestSourceManagerInit(t *testing.T) {
 	cpath, err := ioutil.TempDir("", "smcache")
 	if err != nil {

internal/gps/result_test.go

@@ -13,7 +13,6 @@ import (
 )
 
 var basicResult solution
-var kub atom
 
 func pi(n string) ProjectIdentifier {
 	return ProjectIdentifier{
@@ -36,11 +35,14 @@ func init() {
 		},
 	}
 
-	// just in case something needs punishing, kubernetes is happy to oblige
-	kub = atom{
-		id: pi("github.com/kubernetes/kubernetes"),
-		v:  NewVersion("1.0.0").Is(Revision("528f879e7d3790ea4287687ef0ab3f2a01cc2718")),
-	}
+	// Just in case something needs punishing, kubernetes offers a complex,
+	// real-world set of dependencies, and this revision is known to work.
+	/*
+		_ = atom{
+			id: pi("github.com/kubernetes/kubernetes"),
+			v:  NewVersion("1.0.0").Is(Revision("528f879e7d3790ea4287687ef0ab3f2a01cc2718")),
+		}
+	*/
 }
 
 func testWriteDepTree(t *testing.T) {