From c56e9b2223ddc636008ab0fd1de3711dd0c6760a Mon Sep 17 00:00:00 2001 From: penghaoh Date: Mon, 8 Jun 2020 13:31:00 -0700 Subject: [PATCH] Fix broken e2e test --- e2e/addons/addons_test.go | 2 +- e2e/init/init_test.go | 2 +- e2e/internal/client/outputs.go | 2 +- e2e/multi-env-app/multi_env_test.go | 2 +- e2e/multi-svc-app/multi_svc_app_test.go | 4 ++-- e2e/multi-svc-app/www/main.go | 7 +++++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/e2e/addons/addons_test.go b/e2e/addons/addons_test.go index 4e18df16601..64120f5fa35 100644 --- a/e2e/addons/addons_test.go +++ b/e2e/addons/addons_test.go @@ -208,7 +208,7 @@ var _ = Describe("addons flow", func() { for _, logLine := range svcLogs { Expect(logLine.Message).NotTo(Equal("")) - Expect(logLine.TaskID).NotTo(Equal("")) + Expect(logLine.LogStreamName).NotTo(Equal("")) Expect(logLine.Timestamp).NotTo(Equal(0)) Expect(logLine.IngestionTime).NotTo(Equal(0)) } diff --git a/e2e/init/init_test.go b/e2e/init/init_test.go index ff7a041a805..77169b86092 100644 --- a/e2e/init/init_test.go +++ b/e2e/init/init_test.go @@ -127,7 +127,7 @@ var _ = Describe("init flow", func() { for _, logLine := range svcLogs { Expect(logLine.Message).NotTo(Equal("")) - Expect(logLine.TaskID).NotTo(Equal("")) + Expect(logLine.LogStreamName).NotTo(Equal("")) Expect(logLine.Timestamp).NotTo(Equal(0)) Expect(logLine.IngestionTime).NotTo(Equal(0)) } diff --git a/e2e/internal/client/outputs.go b/e2e/internal/client/outputs.go index d1473c37593..c0704888fbe 100644 --- a/e2e/internal/client/outputs.go +++ b/e2e/internal/client/outputs.go @@ -60,7 +60,7 @@ func toSvcListOutput(jsonInput string) (*SvcListOutput, error) { } type SvcLogsOutput struct { - TaskID string `json:"taskID"` + LogStreamName string `json:"logStreamName"` IngestionTime int64 `json:"ingestionTime"` Timestamp int64 `json:"timestamp"` Message string `json:"message"` diff --git a/e2e/multi-env-app/multi_env_test.go b/e2e/multi-env-app/multi_env_test.go index 606e3a7973a..6fa2413811b 100644 --- a/e2e/multi-env-app/multi_env_test.go +++ b/e2e/multi-env-app/multi_env_test.go @@ -198,7 +198,7 @@ var _ = Describe("Multiple Env App", func() { for _, logLine := range svcLogs { Expect(logLine.Message).NotTo(Equal("")) - Expect(logLine.TaskID).NotTo(Equal("")) + Expect(logLine.LogStreamName).NotTo(Equal("")) Expect(logLine.Timestamp).NotTo(Equal(0)) Expect(logLine.IngestionTime).NotTo(Equal(0)) } diff --git a/e2e/multi-svc-app/multi_svc_app_test.go b/e2e/multi-svc-app/multi_svc_app_test.go index 5725730d3c8..8d4a34b6637 100644 --- a/e2e/multi-svc-app/multi_svc_app_test.go +++ b/e2e/multi-svc-app/multi_svc_app_test.go @@ -31,7 +31,7 @@ var _ = Describe("Multiple Service App", func() { Expect("./copilot").Should(BeADirectory()) }) - It("app ls includes new project", func() { + It("app ls includes new application", func() { apps, err := cli.AppList() Expect(err).NotTo(HaveOccurred()) Expect(apps).To(ContainSubstring(appName)) @@ -235,7 +235,7 @@ var _ = Describe("Multiple Service App", func() { for _, logLine := range svcLogs { Expect(logLine.Message).NotTo(Equal("")) - Expect(logLine.TaskID).NotTo(Equal("")) + Expect(logLine.LogStreamName).NotTo(Equal("")) Expect(logLine.Timestamp).NotTo(Equal(0)) Expect(logLine.IngestionTime).NotTo(Equal(0)) } diff --git a/e2e/multi-svc-app/www/main.go b/e2e/multi-svc-app/www/main.go index e5d9c4292d5..a9692ff90c4 100644 --- a/e2e/multi-svc-app/www/main.go +++ b/e2e/multi-svc-app/www/main.go @@ -14,8 +14,15 @@ func SimpleGet(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { w.Write([]byte("www")) } +func healthCheckHandler(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { + log.Println("Health Check Succeeded") + w.WriteHeader(http.StatusOK) + w.Write([]byte("www")) +} + func main() { router := httprouter.New() + router.GET("/", healthCheckHandler) router.GET("/www/", SimpleGet) log.Fatal(http.ListenAndServe(":80", router)) }