Merge pull request #3363 from /issues/3328-golang-multiprocess-app

Reimplement the multi-process test app with go

.gitignore

@@ -5,3 +5,4 @@
 ~/.*
 *.test
 tests/assets/dorifi/dorifi
+tests/assets/multi-process/dorifi

Makefile

@@ -82,6 +82,7 @@ test-smoke: build-dorifi
 
 build-dorifi:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -C tests/assets/golang -o ../dorifi/dorifi .
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -C tests/assets/golang -o ../multi-process/dorifi .
 
 GOFUMPT = $(shell go env GOPATH)/bin/gofumpt
 install-gofumpt:

tests/assets/golang/main.go

@@ -8,12 +8,26 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"time"
 )
 
 const ServiceBindingRootEnv = "SERVICE_BINDING_ROOT"
 
 func main() {
-	http.HandleFunc("/", helloWorldHandler)
+	arg := ""
+	if len(os.Args) > 1 {
+		arg = os.Args[1]
+	}
+
+	if arg != "" && arg != "web" {
+		for range time.Tick(time.Second * 1) {
+			fmt.Printf("Hello from %q\n", arg)
+		}
+
+		return
+	}
+
+	http.HandleFunc("/", helloWorldHandler(arg))
 	http.HandleFunc("/env.json", envJsonHandler)
 	http.HandleFunc("/servicebindingroot", serviceBindingRootHandler)
 	http.HandleFunc("/servicebindings", serviceBindingsHandler)
@@ -50,8 +64,14 @@ func exitHandler(w http.ResponseWriter, r *http.Request) {
 	os.Exit(exitCode)
 }
 
-func helloWorldHandler(w http.ResponseWriter, _ *http.Request) {
-	fmt.Fprintln(w, "Hi, I'm Dorifi!")
+func helloWorldHandler(arg string) func(w http.ResponseWriter, _ *http.Request) {
+	return func(w http.ResponseWriter, _ *http.Request) {
+		if arg == "" {
+			fmt.Fprintln(w, "Hi, I'm Dorifi!")
+		} else {
+			fmt.Fprintf(w, "Hi, I'm Dorifi (%s)!\n", arg)
+		}
+	}
 }
 
 func envJsonHandler(w http.ResponseWriter, _ *http.Request) {

tests/assets/multi-process/Procfile

@@ -1,2 +1,2 @@
-web: node server.js
-worker: node server.js worker
+web: ./dorifi web
+worker: ./dorifi worker

tests/e2e/apps_test.go

@@ -544,7 +544,7 @@ var _ = Describe("Apps", func() {
 			})
 
 			It("returns a different endpoint result", func() {
-				Eventually(func() []byte { return curlApp(appGUID, "") }).Should(ContainSubstring("Hello from a multi-process app!"))
+				Eventually(func() []byte { return curlApp(appGUID, "") }).Should(ContainSubstring("Hi, I'm Dorifi (web)!"))
 			})
 		})
 

tests/e2e/multi_process_test.go

@@ -23,7 +23,7 @@ var _ = Describe("Multi Process", func() {
 		appGUID, _ = pushTestApp(spaceGUID, multiProcessAppBitsFile)
 		workerProcessGUID = getProcess(appGUID, "worker").GUID
 		body := curlApp(appGUID, "")
-		Expect(body).To(ContainSubstring("Hello from a multi-process app!"))
+		Expect(body).To(ContainSubstring("Hi, I'm Dorifi (web)!"))
 	})
 
 	AfterEach(func() {