use new manifest constructor and making requested changes

golang · Aug 22, 2017 · 4603971 · 4603971
1 parent 5a5aaf2
commit 4603971
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/cmd/dep/govend_importer.go b/cmd/dep/govend_importer.go
@@ -91,9 +91,7 @@ func (g *govendImporter) load(projectDir string) error {
 func (g *govendImporter) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
 	g.logger.Println("Converting from vendor.yaml...")
 
-	manifest := &dep.Manifest{
-		Constraints: make(gps.ProjectConstraints),
-	}
+	manifest := dep.NewManifest()
 	lock := &dep.Lock{}
 
 	for _, pkg := range g.yaml.Imports {

diff --git a/cmd/dep/govend_importer_test.go b/cmd/dep/govend_importer_test.go
@@ -108,7 +108,7 @@ func TestGovendConfig_Import(t *testing.T) {
 	// Disable verbose so that we don't print values that change each test run
 	g := newGovendImporter(logger, false, sm)
 	if !g.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect godep configuration file")
+		t.Fatal("Expected the importer to detect govend configuration file")
 	}
 
 	m, l, err := g.Import(projectRoot, testProjectRoot)

diff --git a/cmd/dep/testdata/harness_tests/init/govend/case1/testcase.json b/cmd/dep/testdata/harness_tests/init/govend/case1/testcase.json
@@ -10,4 +10,4 @@
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"
   ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
         "github.com/sdboyer/deptest",
         "github.com/sdboyer/deptestdos"
       ]
-    }
+    }