Add simple start counter test

test/e2etests.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/deref/exo/test/tester"
@@ -85,6 +86,48 @@ var tests = map[string]tester.ExoTest{
 				return err
 			}
 
+			return nil
+		},
+	},
+	"start-counter": {
+		FixtureDir: "start-counter",
+		Test: func(ctx context.Context, t tester.ExoTester) error {
+			// FIXME: This doesn't work right now because we don't have an easy way of
+			// removing volumes that are still attached to a previous container.
+			if _, stderr, err := t.RunCmd(ctx, "docker", []string{"volume", "rm", "e2etest-start-counter"}); err != nil {
+				if !strings.Contains(stderr, "No such volume") {
+					return err
+				}
+			}
+
+			if _, _, err := t.RunExo(ctx, "init"); err != nil {
+				return err
+			}
+			if _, _, err := t.RunExo(ctx, "start"); err != nil {
+				return err
+			}
+
+			if err := t.WaitTillProcessesReachState(ctx, "running", []string{"counter"}); err != nil {
+				return err
+			}
+			if err := tester.ExpectResponse(ctx, "http://localhost:44225/count", "1"); err != nil {
+				return err
+			}
+
+			if _, _, err := t.RunExo(ctx, "stop"); err != nil {
+				return err
+			}
+			if _, _, err := t.RunExo(ctx, "start"); err != nil {
+				return err
+			}
+
+			if err := t.WaitTillProcessesReachState(ctx, "running", []string{"counter"}); err != nil {
+				return err
+			}
+			if err := tester.ExpectResponse(ctx, "http://localhost:44225/count", "2"); err != nil {
+				return err
+			}
+
 			return nil
 		},
 	},

test/image/fixtures/simple-example/exo.hcl

@@ -22,7 +22,4 @@ components {
     }
     env_file = "./env"
   }
-
-  volume "logvolume01" {}
-
 }

test/image/fixtures/start-counter/exo.hcl

@@ -0,0 +1,13 @@
+exo = "0.1"
+
+components {
+  container "counter" {
+    image = "python:3"
+    working_dir = "/my-count"
+    command = "expr $(cat count) + 1 > count ; python3 -m http.server"
+    volumes = ["e2etest-start-counter:/my-count"]
+    ports = ["44225:8000"]
+  }
+
+  volume "e2etest-start-counter" {}
+}

test/tester/tester.go

@@ -53,6 +53,7 @@ func (et ExoTester) RunTest(ctx context.Context, test ExoTest) (io.Reader, error
 }
 
 func (et ExoTester) WaitTillProcessesReachState(ctx context.Context, state string, names []string) error {
+	et.logger.Info("Waiting for ", names, " to reach state ", state)
 	errTimeout := fmt.Errorf("timed out waiting for %q to reach %s", strings.Join(names, ", "), state)
 	for {
 		processes, err := et.PS(ctx)
@@ -88,9 +89,9 @@ func (et ExoTester) WaitTillProcessesReachState(ctx context.Context, state strin
 }
 
 // Runs an exo CLI command and blocks until it terminates.
-func (et ExoTester) RunExo(ctx context.Context, arguments ...string) (stdout, stderr string, err error) {
+func (et ExoTester) RunCmd(ctx context.Context, program string, arguments []string) (stdout, stderr string, err error) {
 	path, _ := os.LookupEnv("PATH")
-	cmd := exec.CommandContext(ctx, et.exoBinary, arguments...)
+	cmd := exec.CommandContext(ctx, program, arguments...)
 	cmd.Dir = et.fixtureDir
 	cmd.Env = append(cmd.Env, "EXO_HOME="+et.exoHome)
 	cmd.Env = append(cmd.Env, "PATH="+path)
@@ -101,14 +102,19 @@ func (et ExoTester) RunExo(ctx context.Context, arguments ...string) (stdout, st
 	stderrWriter := io.MultiWriter(&stderrBuffer, logWriter)
 	cmd.Stderr = stderrWriter
 	cmd.Stdout = stdoutWriter
-	et.logger.Debug("Running exo ", cmd.Args)
-	et.logger.Debug("env ", cmd.Env)
-	et.logger.Debug("wd ", cmd.Dir)
+	et.logger.Debug("Running ", cmd.Args)
+	et.logger.Debug("env: ", cmd.Env)
+	et.logger.Debug("working dir: ", cmd.Dir)
 	err = cmd.Run()
 	et.logger.Debug("exit code: ", cmd.ProcessState.ExitCode())
 	return stdoutBuffer.String(), stderrBuffer.String(), err
 }
 
+// Runs an exo CLI command and blocks until it terminates.
+func (et ExoTester) RunExo(ctx context.Context, arguments ...string) (stdout, stderr string, err error) {
+	return et.RunCmd(ctx, et.exoBinary, arguments)
+}
+
 type psProcessInfo struct {
 	Name   string
 	ID     string

test/tester/utils.go

@@ -1,6 +1,7 @@
 package tester
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io/ioutil"
@@ -42,6 +43,7 @@ func ExpectResponse(ctx context.Context, endpoint string, expectedResponse strin
 		return fmt.Errorf("failed to read response body: %w", err)
 	}
 
+	body = bytes.TrimSpace(body)
 	if string(body) != expectedResponse {
 		return fmt.Errorf("expected response body to be %q, got %q", expectedResponse, string(body))
 	}