Merge pull request #204 from xeger/go15vendorexperiment

Support GO15VENDOREXPERIMENT by ignoring vendored test suites.

ginkgo/testsuite/test_suite.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -47,6 +48,15 @@ func PrecompiledTestSuite(path string) (TestSuite, error) {
 
 func SuitesInDir(dir string, recurse bool) []TestSuite {
 	suites := []TestSuite{}
+
+	// "This change will only be enabled if the go command is run with
+	// GO15VENDOREXPERIMENT=1 in its environment."
+	// c.f. the vendor-experiment proposal https://goo.gl/2ucMeC
+	vendorExperiment := os.Getenv("GO15VENDOREXPERIMENT")
+	if (vendorExperiment == "1") && path.Base(dir) == "vendor" {
+		return suites
+	}
+
 	files, _ := ioutil.ReadDir(dir)
 	re := regexp.MustCompile(`_test\.go$`)
 	for _, file := range files {

ginkgo/testsuite/testsuite_test.go

@@ -23,6 +23,16 @@ var _ = Describe("TestSuite", func() {
 		ioutil.WriteFile(path, []byte(content), mode)
 	}
 
+	var origVendor string
+
+	BeforeSuite(func() {
+		origVendor = os.Getenv("GO15VENDOREXPERIMENT")
+	})
+
+	AfterSuite(func() {
+		os.Setenv("GO15VENDOREXPERIMENT", origVendor)
+	})
+
 	BeforeEach(func() {
 		var err error
 		tmpDir, err = ioutil.TempDir("/tmp", "ginkgo")
@@ -49,6 +59,9 @@ var _ = Describe("TestSuite", func() {
 		//ginkgo tests in a deeply nested directory
 		writeFile("/colonelmustard/library", "library_test.go", `import "github.com/onsi/ginkgo"`, 0666)
 
+		//ginkgo tests deeply nested in a vendored dependency
+		writeFile("/vendor/mrspeacock/lounge", "lounge_test.go", `import "github.com/onsi/ginkgo"`, 0666)
+
 		//a precompiled ginkgo test
 		writeFile("/precompiled-dir", "precompiled.test", `fake-binary-file`, 0777)
 		writeFile("/precompiled-dir", "some-other-binary", `fake-binary-file`, 0777)
@@ -138,10 +151,30 @@ var _ = Describe("TestSuite", func() {
 			})
 		})
 
+		Context("given GO15VENDOREXPERIMENT", func() {
+			BeforeEach(func() {
+				os.Setenv("GO15VENDOREXPERIMENT", "1")
+			})
+
+			AfterEach(func() {
+				os.Setenv("GO15VENDOREXPERIMENT", "")
+			})
+
+			It("should skip vendor dirs", func() {
+				suites := SuitesInDir(filepath.Join(tmpDir+"/vendor"), false)
+				Ω(suites).Should(HaveLen(0))
+			})
+
+			It("should not recurse into vendor dirs", func() {
+				suites := SuitesInDir(filepath.Join(tmpDir), true)
+				Ω(suites).Should(HaveLen(3))
+			})
+		})
+
 		Context("when recursively scanning", func() {
 			It("should return suites for corresponding test suites, only", func() {
 				suites := SuitesInDir(tmpDir, true)
-				Ω(suites).Should(HaveLen(3))
+				Ω(suites).Should(HaveLen(4))
 
 				Ω(suites).Should(ContainElement(TestSuite{
 					Path:        relTmpDir + "/colonelmustard",