Fix bad merge from golang#978

carolynvs · carolynvs · commit b8790414dcff · 2017-08-11T13:44:47.000-05:00
diff --git a/cmd/dep/glide_importer_test.go b/cmd/dep/glide_importer_test.go
@@ -397,7 +397,7 @@ func TestGlideConfig_Convert_ConsolidateRootPackages(t *testing.T) {
 		},
 	}
 
-	manifest, lock, err := g.convert(testGlideProjectRoot)
+	manifest, lock, err := g.convert(testProjectRoot)
 	h.Must(err)
 
 	gotMLen := len(manifest.Constraints)

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ func TestGlideConfig_Convert_ConsolidateRootPackages(t *testing.T) {`
`397`	`397`	`},`
`398`	`398`	`}`
`399`	`399`
`400`		`- manifest, lock, err := g.convert(testGlideProjectRoot)`
	`400`	`+ manifest, lock, err := g.convert(testProjectRoot)`
`401`	`401`	`h.Must(err)`
`402`	`402`
`403`	`403`	`gotMLen := len(manifest.Constraints)`