return an error when Envoy fails to start

utako · utako · commit cc7f42988a0a · 2018-04-27T11:22:37.000-07:00
mixer and backend should also do this, but that involves slightly more
work.
diff --git a/mixer/test/client/env/envoy.go b/mixer/test/client/env/envoy.go
@@ -71,13 +71,16 @@ func (s *TestSetup) NewEnvoy(stress, faultInject bool, mfConf *MixerFilterConf,
 // Start starts the envoy process
 func (s *Envoy) Start() error {
 	err := s.cmd.Start()
-	if err == nil {
-		url := fmt.Sprintf("http://localhost:%v/server_info", s.ports.AdminPort)
-		WaitForHTTPServer(url)
-		WaitForPort(s.ports.ClientProxyPort)
-		WaitForPort(s.ports.ServerProxyPort)
+	if err != nil {
+		return err
 	}
-	return err
+
+	url := fmt.Sprintf("http://localhost:%v/server_info", s.ports.AdminPort)
+	WaitForHTTPServer(url)
+	WaitForPort(s.ports.ClientProxyPort)
+	WaitForPort(s.ports.ServerProxyPort)
+
+	return nil
 }
 
 // Stop stops the envoy process
diff --git a/mixer/test/client/env/http_server.go b/mixer/test/client/env/http_server.go
@@ -128,6 +128,7 @@ func NewHTTPServer(port uint16) (*HTTPServer, error) {
 }
 
 // Start starts the server
+// TODO: Add a channel so this can return an error
 func (s *HTTPServer) Start() {
 	go func() {
 		http.HandleFunc("/", handler)
diff --git a/mixer/test/client/env/mixer_server.go b/mixer/test/client/env/mixer_server.go
@@ -154,6 +154,7 @@ func NewMixerServer(port uint16, stress bool) (*MixerServer, error) {
 }
 
 // Start starts the mixer server
+// TODO: Add a channel so this can return an error
 func (ts *MixerServer) Start() {
 	go func() {
 		err := ts.gs.Serve(ts.lis)
diff --git a/mixer/test/client/env/setup.go b/mixer/test/client/env/setup.go
@@ -154,8 +154,11 @@ func (s *TestSetup) SetUp() error {
 	s.envoy, err = s.NewEnvoy(s.stress, s.faultInject, s.mfConf, s.ports, s.epoch, s.mfConfVersion)
 	if err != nil {
 		log.Printf("unable to create Envoy %v", err)
-	} else {
-		_ = s.envoy.Start()
+	}
+
+	err = s.envoy.Start()
+	if err != nil {
+		return err
 	}
 
 	if !s.noMixer {
diff --git a/tests/e2e/tests/pilot/cloudfoundry/copilot_test.go b/tests/e2e/tests/pilot/cloudfoundry/copilot_test.go
@@ -154,7 +154,9 @@ func TestWildcardHostEdgeRouterWithMockCopilot(t *testing.T) {
 	}
 
 	t.Log("run envoy...")
-	testEnv.SetUp()
+	if err := testEnv.SetUp(); err != nil {
+		t.Fatalf("Failed to setup test: %v", err)
+	}
 	defer testEnv.TearDown()
 
 	t.Log("curling the app with expected host header")

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ func NewHTTPServer(port uint16) (*HTTPServer, error) {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`// Start starts the server`
	`131`	`+// TODO: Add a channel so this can return an error`
`131`	`132`	`func (s *HTTPServer) Start() {`
`132`	`133`	`go func() {`
`133`	`134`	`http.HandleFunc("/", handler)`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ func NewMixerServer(port uint16, stress bool) (*MixerServer, error) {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`// Start starts the mixer server`
	`157`	`+// TODO: Add a channel so this can return an error`
`157`	`158`	`func (ts *MixerServer) Start() {`
`158`	`159`	`go func() {`
`159`	`160`	`err := ts.gs.Serve(ts.lis)`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,9 @@ func TestWildcardHostEdgeRouterWithMockCopilot(t *testing.T) {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`t.Log("run envoy...")`
`157`		`- testEnv.SetUp()`
	`157`	`+ if err := testEnv.SetUp(); err != nil {`
	`158`	`+ t.Fatalf("Failed to setup test: %v", err)`
	`159`	`+ }`
`158`	`160`	`defer testEnv.TearDown()`
`159`	`161`
`160`	`162`	`t.Log("curling the app with expected host header")`