Parse duration correctly and add acceptance test

services/duration.go

@@ -0,0 +1,36 @@
+package services
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/pkg/errors"
+)
+
+type Duration struct {
+	time.Duration
+}
+
+func (d Duration) MarshalJSON() ([]byte, error) {
+	return json.Marshal(d.String())
+}
+
+func (d *Duration) UnmarshalJSON(b []byte) error {
+	var (
+		v   interface{}
+		err error
+	)
+	if err = json.Unmarshal(b, &v); err != nil {
+		return errors.WithStack(err)
+	}
+	switch value := v.(type) {
+	case string:
+		d.Duration, err = time.ParseDuration(value)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		return nil
+	default:
+		return errors.New("invalid duration")
+	}
+}

services/serviceconfig.go

@@ -51,7 +51,7 @@ type ServiceConfig struct {
 
 	// Timeout for terminating a service runner. If termination has not completed after this amount
 	// of time, the runner will be killed.
-	TerminationTimeout *time.Duration `json:"terminationTimeout,omitempty"`
+	TerminationTimeout *Duration `json:"terminationTimeout,omitempty"`
 }
 
 // GetTerminationTimeout returns the timeout for termination, if no timeout is set, the
@@ -60,7 +60,7 @@ func (c *ServiceConfig) GetTerminationTimeout() time.Duration {
 	if c.TerminationTimeout == nil {
 		return 30 * time.Second
 	}
-	return *c.TerminationTimeout
+	return c.TerminationTimeout.Duration
 }
 
 // Backend returns the default backend for this service

test/acceptance/acceptance_test.go

@@ -100,7 +100,7 @@ func expectErrorFromURL(t *testing.T, url string) {
 
 	_, err := getFromURL(url)
 	if err == nil {
-		t.Error("expected an error when service stopped")
+		t.Error("expected an error loading URL when service stopped")
 	}
 }
 

test/acceptance/stop_test.go

@@ -19,6 +19,15 @@ func TestStop(t *testing.T) {
 				"http://127.0.0.1:51234/": "Hello",
 			},
 		},
+		{
+			name:      "graceless shutdown with timeout",
+			dataDir:   "testdata/graceless_shutdown",
+			startArgs: []string{"start", "gracelessWithTimeout"},
+			stopArgs:  []string{"stop", "gracelessWithTimeout"},
+			expectedURLs: map[string]string{
+				"http://127.0.0.1:51234/": "Hello",
+			},
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {

test/acceptance/testdata/graceless_shutdown/edward.json

@@ -9,6 +9,17 @@
             "log_properties": {
                 "started": "Waiting for signal"
             }
+        },
+        {
+            "name": "gracelessWithTimeout",
+            "path": ".",
+            "commands": {
+                "launch": "go run main.go"
+            },
+            "log_properties": {
+                "started": "Waiting for signal"
+            },
+            "terminationTimeout": "5s"
         }
     ]
 }

test/acceptance/testdata/graceless_shutdown/main.go

@@ -39,6 +39,6 @@ func main() {
 	fmt.Println("Waiting for signal")
 	<-done
 	fmt.Println("Pretending to do some cleanup")
-	time.Sleep(1 * time.Hour)
+	time.Sleep(1 * time.Minute)
 	fmt.Println("exiting")
 }