added optional test timeout flag

Author: nikogura

cmd/build.go

@@ -83,7 +83,7 @@ Binaries are dropped into the current working directory.
 		}
 
 		if !buildSkipTests {
-			err = lang.Test(workDir, meta.Package)
+			err = lang.Test(workDir, meta.Package, testTimeout)
 			if err != nil {
 				log.Fatalf("error running go test: %s", err)
 			}

cmd/publish.go

@@ -109,7 +109,7 @@ Publish will upload your binaries to wherever it is you've configured them to go
 			}
 
 			if !pubSkipTests {
-				err = lang.Test(workDir, meta.Package)
+				err = lang.Test(workDir, meta.Package, testTimeout)
 				if err != nil {
 					log.Fatalf("error running go test: %s", err)
 				}

cmd/root.go

@@ -29,6 +29,7 @@ var branch string
 var dryrun bool
 var workdir string
 var buildSkipTargets string
+var testTimeout string
 
 //var pubSkipTargets string
 
@@ -59,6 +60,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&branch, "branch", "b", "master", "Branch to operate upon")
 	rootCmd.PersistentFlags().StringVarP(&workdir, "workdir", "w", "", "Workdir.  If omitted, a temp dir will be created and subsequently cleaned up.")
 	rootCmd.PersistentFlags().StringVarP(&buildSkipTargets, "skip-build-targets", "", "", fmt.Sprintf("Comma separated list of build targets from %s to skip.", gomason.METADATA_FILENAME))
+	rootCmd.PersistentFlags().StringVarP(&testTimeout, "test-timeout", "", "", "timeout for tests to complete (must be valid time input for language)")
 
 	//rootCmd.PersistentFlags().StringVarP(&pubSkipTargets, fmt.Sprintf("skip-publish-targets", "", "", "Comma separated list of publish targets from %s to skip.", gomason.METADATA_FILENAME))
 }

cmd/sign.go

@@ -78,7 +78,7 @@ Signing sorta implies something to sign, which in turn, implies that it built, w
 			log.Fatalf("error running prep steps: %s", err)
 		}
 
-		err = lang.Test(workDir, meta.Package)
+		err = lang.Test(workDir, meta.Package, testTimeout)
 		if err != nil {
 			log.Fatalf("error running go test: %s", err)
 		}

cmd/test.go

@@ -80,7 +80,7 @@ Sometimes you need the benefits of a full system here.  Now.  Right at your fing
 			log.Fatalf("error running prep steps: %s", err)
 		}
 
-		err = lang.Test(workDir, meta.Package)
+		err = lang.Test(workDir, meta.Package, testTimeout)
 		if err != nil {
 			log.Fatalf("error running go test: %s", err)
 		}

metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.7.0",
+  "version": "2.8.0",
   "package": "github.com/nikogura/gomason",
   "description": "A tool for testing, building, signing, and publishing your project from a clean workspace.",
   "repository": "http://localhost:8081/artifactory/generic-local",

pkg/gomason/golang.go

@@ -154,7 +154,7 @@ func (Golang) Prep(gopath string, meta Metadata) (err error) {
 }
 
 // Test Runs 'go test -v ./...' in the checked out code directory
-func (Golang) Test(gopath string, gomodule string) (err error) {
+func (Golang) Test(gopath string, gomodule string, timeout string) (err error) {
 	wd := filepath.Join(gopath, "src", gomodule)
 
 	log.Printf("[DEBUG] Changing working directory to %s.\n", wd)
@@ -168,7 +168,13 @@ func (Golang) Test(gopath string, gomodule string) (err error) {
 
 	log.Print("[DEBUG] Running 'go test -v ./...'.\n\n")
 
-	cmd := exec.Command("go", "test", "-v", "./...")
+	var timeoutArg string
+
+	if timeout != "" {
+		timeoutArg = fmt.Sprintf("-timeout %s", timeout)
+	}
+
+	cmd := exec.Command("go", "test", "-v", timeoutArg, "./...")
 
 	runenv := append(os.Environ(), fmt.Sprintf("GOPATH=%s", gopath))
 	runenv = append(runenv, "GO111MODULE=on")

pkg/gomason/golang_test.go

@@ -264,7 +264,7 @@ func TestTest(t *testing.T) {
 		t.FailNow()
 	}
 
-	err = lang.Test(gopath, testMetadataObj().Package)
+	err = lang.Test(gopath, testMetadataObj().Package, "10m")
 	if err != nil {
 		log.Printf("error running go test: %s", err)
 		t.FailNow()

pkg/gomason/languages.go

@@ -14,7 +14,7 @@ type Language interface {
 	CreateWorkDir(string) (string, error)
 	Checkout(workdir string, meta Metadata, branch string) error
 	Prep(workdir string, meta Metadata) error
-	Test(workdir string, module string) error
+	Test(workdir string, module string, timeout string) error
 	Build(workdir string, meta Metadata, skipTargets string) error
 }
 
@@ -37,7 +37,7 @@ func (NoLanguage) Prep(workdir string, meta Metadata) error {
 }
 
 // Test Stub for the Test action
-func (NoLanguage) Test(workdir string, module string) error {
+func (NoLanguage) Test(workdir string, module string, timeout string) error {
 	return nil
 }
 

pkg/gomason/languages_test.go

@@ -19,7 +19,7 @@ func TestNoLanguage(t *testing.T) {
 	err = nl.Prep("", Metadata{})
 	assert.True(t, err == nil, "Prep returned an error")
 
-	err = nl.Test("", "")
+	err = nl.Test("", "", "")
 	assert.True(t, err == nil, "Test returned an error")
 
 	err = nl.Build("", Metadata{}, "")