Add test for configurable timeouts

Author: aledbf

boot.go

@@ -17,8 +17,6 @@ import (
 const (
 	serverConfAppName     = "deis-builder-server"
 	gitReceiveConfAppName = "deis-builder-git-receive"
-	builderPodTick        = 100
-	objectStorageTick     = 500
 )
 
 func init() {
@@ -61,14 +59,7 @@ func main() {
 					pkglog.Err("Error getting config for %s [%s]", gitReceiveConfAppName, err)
 					os.Exit(1)
 				}
-
-				// check for invalid ticks duration
-				if cnf.BuilderPodTickDurationMSec >= cnf.BuilderPodWaitDurationMSec {
-					cnf.BuilderPodTickDurationMSec = builderPodTick
-				}
-				if cnf.ObjectStorageTickDurationMSec >= cnf.ObjectStorageWaitDurationMSec {
-					cnf.ObjectStorageTickDurationMSec = objectStorageTick
-				}
+				cnf.CheckDurations()
 
 				if err := gitreceive.Run(cnf); err != nil {
 					pkglog.Err("running git receive hook [%s]", err)

pkg/gitreceive/config.go

@@ -5,6 +5,11 @@ import (
 	"time"
 )
 
+const (
+	builderPodTick    = 100
+	objectStorageTick = 500
+)
+
 type Config struct {
 	// k8s service discovery env vars
 	WorkflowHost string `envconfig:"DEIS_WORKFLOW_SERVICE_HOST" required:"true"`
@@ -58,3 +63,21 @@ func (c Config) ObjectStorageTickDuration() time.Duration {
 func (c Config) ObjectStorageWaitDuration() time.Duration {
 	return time.Duration(time.Duration(c.ObjectStorageWaitDurationMSec) * time.Millisecond)
 }
+
+// CheckDurations checks if ticks for builder and object storage are not bigger
+// than the maximum duration. In case of this it will set the tick to the default
+func (c *Config) CheckDurations() {
+	if c.BuilderPodTickDurationMSec >= c.BuilderPodWaitDurationMSec {
+		c.BuilderPodTickDurationMSec = builderPodTick
+	}
+	if c.BuilderPodTickDurationMSec < builderPodTick {
+		c.BuilderPodTickDurationMSec = builderPodTick
+	}
+
+	if c.ObjectStorageTickDurationMSec >= c.ObjectStorageWaitDurationMSec {
+		c.ObjectStorageTickDurationMSec = objectStorageTick
+	}
+	if c.ObjectStorageTickDurationMSec < objectStorageTick {
+		c.ObjectStorageTickDurationMSec = objectStorageTick
+	}
+}

pkg/gitreceive/config_test.go

@@ -0,0 +1,46 @@
+package gitreceive
+
+import (
+	"testing"
+)
+
+type checkCase struct {
+	podTick     int
+	podWait     int
+	storageTick int
+	storageWait int
+}
+
+func TestCheckDurations(t *testing.T) {
+	cases := map[checkCase]checkCase{
+		checkCase{100, 300000, 500, 300000}:    checkCase{100, 300000, 500, 300000},
+		checkCase{0, 300000, 500, 300000}:      checkCase{100, 300000, 500, 300000},
+		checkCase{100, 300000, 0, 300000}:      checkCase{100, 300000, 500, 300000},
+		checkCase{300000, 300000, 500, 300000}: checkCase{100, 300000, 500, 300000},
+		checkCase{100, 300000, 300000, 300000}: checkCase{100, 300000, 500, 300000},
+	}
+
+	var cnf Config
+	for tCase, eCase := range cases {
+		cnf = Config{
+			BuilderPodTickDurationMSec:    tCase.podTick,
+			BuilderPodWaitDurationMSec:    tCase.podWait,
+			ObjectStorageTickDurationMSec: tCase.storageTick,
+			ObjectStorageWaitDurationMSec: tCase.storageWait,
+		}
+		cnf.CheckDurations()
+
+		if cnf.BuilderPodTickDurationMSec != eCase.podTick {
+			t.Fatalf("expected %v but %v was returned (%v)", eCase.podTick, cnf.BuilderPodTickDurationMSec, tCase)
+		}
+		if cnf.BuilderPodWaitDurationMSec != eCase.podWait {
+			t.Fatalf("expected %v but %v was returned (%v)", eCase.podWait, cnf.BuilderPodWaitDurationMSec, tCase)
+		}
+		if cnf.ObjectStorageTickDurationMSec != eCase.storageTick {
+			t.Fatalf("expected %v but %v was returned (%v)", eCase.storageTick, cnf.ObjectStorageTickDurationMSec, tCase)
+		}
+		if cnf.ObjectStorageWaitDurationMSec != eCase.storageWait {
+			t.Fatalf("expected %v but %v was returned (%v)", eCase.storageWait, cnf.ObjectStorageWaitDurationMSec, tCase)
+		}
+	}
+}