Merge pull request #167 from golang/iss166

Fix #166
golang · Apr 4, 2018 · 485faf3 · 485faf3
2 parents 69521b3 + 42764bf
commit 485faf3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/mockgen/parse.go b/mockgen/parse.go
@@ -444,13 +444,13 @@ func importsOfFile(file *ast.File) map[string]string {
 			pkg, err := build.Import(importPath, "", 0)
 			if err != nil {
 				// Fallback to import path suffix. Note that this is uncertain.
-				log.Printf("failed to import package by path %s: %s - fallback to import path suffix", importPath, err.Error())
 				_, last := path.Split(importPath)
 				// If the last path component has dots, the first dot-delimited
 				// field is used as the name.
 				pkgName = strings.SplitN(last, ".", 2)[0]
+			} else {
+				pkgName = pkg.Name
 			}
-			pkgName = pkg.Name
 		}
 
 		if _, ok := m[pkgName]; ok {

diff --git a/mockgen/tests/vendor_dep/doc.go b/mockgen/tests/vendor_dep/doc.go
@@ -1,3 +1,4 @@
 package vendor_dep
 
 //go:generate mockgen -package vendor_dep -destination mock.go github.com/golang/mock/mockgen/tests/vendor_dep VendorsDep
+//go:generate mockgen -destination source_mock_package/mock.go -source=vendor_dep.go
diff --git a/mockgen/tests/vendor_dep/source_mock_package/mock.go b/mockgen/tests/vendor_dep/source_mock_package/mock.go