Merge pull request #653 from jmank88/mkbridge

de-globalize mkBridge function var

Author: sdboyer

internal/gps/bridge.go

@@ -75,9 +75,8 @@ type bridge struct {
 	down bool
 }
 
-// Global factory func to create a bridge. This exists solely to allow tests to
-// override it with a custom bridge and sm.
-var mkBridge = func(s *solver, sm SourceManager, down bool) sourceBridge {
+// mkBridge creates a bridge
+func mkBridge(s *solver, sm SourceManager, down bool) *bridge {
 	return &bridge{
 		sm:     sm,
 		s:      s,

internal/gps/hash_test.go

@@ -22,6 +22,7 @@ func TestHashInputs(t *testing.T) {
 		Manifest:        fix.rootmanifest(),
 		ProjectAnalyzer: naiveAnalyzer{},
 		stdLibFn:        func(string) bool { return false },
+		mkBridgeFn:      overrideMkBridge,
 	}
 
 	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
@@ -74,6 +75,7 @@ func TestHashInputsReqsIgs(t *testing.T) {
 		Manifest:        rm,
 		ProjectAnalyzer: naiveAnalyzer{},
 		stdLibFn:        func(string) bool { return false },
+		mkBridgeFn:      overrideMkBridge,
 	}
 
 	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
@@ -204,6 +206,7 @@ func TestHashInputsOverrides(t *testing.T) {
 		Manifest:        rm,
 		ProjectAnalyzer: naiveAnalyzer{},
 		stdLibFn:        func(string) bool { return false },
+		mkBridgeFn:      overrideMkBridge,
 	}
 
 	table := []struct {

internal/gps/rootdata_test.go

@@ -18,6 +18,7 @@ func TestRootdataExternalImports(t *testing.T) {
 		Manifest:        fix.rootmanifest(),
 		ProjectAnalyzer: naiveAnalyzer{},
 		stdLibFn:        func(string) bool { return false },
+		mkBridgeFn:      overrideMkBridge,
 	}
 
 	is, err := Prepare(params, newdepspecSM(fix.ds, nil))
@@ -72,6 +73,7 @@ func TestGetApplicableConstraints(t *testing.T) {
 		Manifest:        fix.rootmanifest(),
 		ProjectAnalyzer: naiveAnalyzer{},
 		stdLibFn:        func(string) bool { return false },
+		mkBridgeFn:      overrideMkBridge,
 	}
 
 	is, err := Prepare(params, newdepspecSM(fix.ds, nil))

internal/gps/solve_test.go

@@ -26,24 +26,12 @@ var fixtorun string
 // TODO(sdboyer) regression test ensuring that locks with only revs for projects don't cause errors
 func init() {
 	flag.StringVar(&fixtorun, "gps.fix", "", "A single fixture to run in TestBasicSolves or TestBimodalSolves")
-	mkBridge(nil, nil, false)
-	overrideMkBridge()
 }
 
-// sets the mkBridge global func to one that allows virtualized RootDirs
-func overrideMkBridge() {
-	// For all tests, override the base bridge with the depspecBridge that skips
-	// verifyRootDir calls
-	mkBridge = func(s *solver, sm SourceManager, down bool) sourceBridge {
-		return &depspecBridge{
-			&bridge{
-				sm:     sm,
-				s:      s,
-				down:   down,
-				vlists: make(map[ProjectIdentifier][]Version),
-			},
-		}
-	}
+// overrideMkBridge overrides the base bridge with the depspecBridge that skips
+// verifyRootDir calls
+func overrideMkBridge(s *solver, sm SourceManager, down bool) sourceBridge {
+	return &depspecBridge{mkBridge(s, sm, down)}
 }
 
 type testlogger struct {
@@ -73,6 +61,7 @@ func fixSolve(params SolveParameters, sm SourceManager, t *testing.T) (Solution,
 	// always return false, otherwise it would identify pretty much all of
 	// our fixtures as being stdlib and skip everything
 	params.stdLibFn = func(string) bool { return false }
+	params.mkBridgeFn = overrideMkBridge
 	s, err := Prepare(params, sm)
 	if err != nil {
 		return nil, err
@@ -312,7 +301,9 @@ func TestBadSolveOpts(t *testing.T) {
 	fix.ds[0].n = ProjectRoot(pn)
 
 	sm := newdepspecSM(fix.ds, nil)
-	params := SolveParameters{}
+	params := SolveParameters{
+		mkBridgeFn: overrideMkBridge,
+	}
 
 	_, err := Prepare(params, nil)
 	if err == nil {
@@ -430,14 +421,7 @@ func TestBadSolveOpts(t *testing.T) {
 
 	// swap out the test mkBridge override temporarily, just to make sure we get
 	// the right error
-	mkBridge = func(s *solver, sm SourceManager, down bool) sourceBridge {
-		return &bridge{
-			sm:     sm,
-			s:      s,
-			down:   down,
-			vlists: make(map[ProjectIdentifier][]Version),
-		}
-	}
+	params.mkBridgeFn = nil
 
 	_, err = Prepare(params, sm)
 	if err == nil {
@@ -454,7 +438,4 @@ func TestBadSolveOpts(t *testing.T) {
 	} else if !strings.Contains(err.Error(), "is a file, not a directory") {
 		t.Error("Prepare should have given error on file as RootDir, but gave:", err)
 	}
-
-	// swap them back...not sure if this matters, but just in case
-	overrideMkBridge()
 }

internal/gps/solver.go

@@ -96,6 +96,11 @@ type SolveParameters struct {
 	// stdLibFn is the function to use to recognize standard library import paths.
 	// Only overridden for tests. Defaults to paths.IsStandardImportPath if nil.
 	stdLibFn func(string) bool
+
+	// mkBridgeFn is the function to use to create sourceBridges.
+	// Only overridden for tests (so we can run with virtual RootDir).
+	// Defaults to mkBridge if nil.
+	mkBridgeFn func(*solver, SourceManager, bool) sourceBridge
 }
 
 // solver is a CDCL-style constraint solver with satisfiability conditions
@@ -285,9 +290,12 @@ func Prepare(params SolveParameters, sm SourceManager) (Solver, error) {
 	}
 
 	// Set up the bridge and ensure the root dir is in good, working order
-	// before doing anything else. (This call is stubbed out in tests, via
-	// overriding mkBridge(), so we can run with virtual RootDir.)
-	s.b = mkBridge(s, sm, params.Downgrade)
+	// before doing anything else.
+	if params.mkBridgeFn == nil {
+		s.b = mkBridge(s, sm, params.Downgrade)
+	} else {
+		s.b = params.mkBridgeFn(s, sm, params.Downgrade)
+	}
 	err = s.b.verifyRootDir(params.RootDir)
 	if err != nil {
 		return nil, err