Add some timeouts

- Test suite get 60s default timeout - main command context get 10s timeout Signed-off-by: Zander Mackie <[email protected]>
kvedurmu · Mar 30, 2020 · 4841580 · 4841580
1 parent a79ed03
commit 4841580
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ PACKAGE_BASE=github.com/buildpacks/pack
 PACKAGES:=$(shell $(GOCMD) list ./... | grep -v /testdata/)
 SRC:=$(shell find . -type f -name '*.go' -not -path "*/vendor/*")
 ARCHIVE_NAME=pack-$(PACK_VERSION)
-TEST_TIMEOUT?=0
+TEST_TIMEOUT?=60s
 UNIT_TIMEOUT?=$(TEST_TIMEOUT)
 ACCEPTANCE_TIMEOUT?=$(TEST_TIMEOUT)
 

diff --git a/cmd/pack/main.go b/cmd/pack/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"os"
+	"time"
 
 	"github.com/heroku/color"
 	"github.com/pkg/errors"
@@ -79,7 +80,7 @@ func main() {
 	rootCmd.Version = cmd.Version
 	rootCmd.SetVersionTemplate(`{{.Version}}{{"\n"}}`)
 
-	ctx := commands.CreateCancellableContext()
+	ctx := commands.CreateTimeoutContext(10 * time.Second)
 	if err := rootCmd.ExecuteContext(ctx); err != nil {
 		if commands.IsSoftError(err) {
 			os.Exit(2)

diff --git a/internal/commands/commands.go b/internal/commands/commands.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
 	"github.com/spf13/cobra"
 
@@ -28,10 +29,10 @@ func AddHelpFlag(cmd *cobra.Command, commandName string) {
 	cmd.Flags().BoolP("help", "h", false, fmt.Sprintf("Help for '%s'", commandName))
 }
 
-func CreateCancellableContext() context.Context {
+func CreateTimeoutContext(timeout time.Duration) context.Context {
 	signals := make(chan os.Signal)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 
 	go func() {
 		<-signals