From 9138a3c76bdee1fe1ed88c8931559847c1438aec Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 17 Dec 2020 16:06:28 +0100 Subject: [PATCH 1/3] removed wait that is not the root cause for metrics flakyness Signed-off-by: Guillaume Tardif --- tests/e2e/e2e_test.go | 6 +++--- tests/framework/mockmetrics.go | 11 +++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index c9e1101e4..eb49bc693 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -151,7 +151,7 @@ func TestContextMetrics(t *testing.T) { c.RunDockerCmd("--help") c.RunDockerCmd("run", "--help") - usage := s.GetUsage(3) + usage := s.GetUsage() assert.DeepEqual(t, []string{ `{"command":"help run","context":"moby","source":"cli","status":"success"}`, `{"command":"--help","context":"moby","source":"cli","status":"success"}`, @@ -166,7 +166,7 @@ func TestContextMetrics(t *testing.T) { c.RunDockerCmd("version") c.RunDockerOrExitError("version", "--xxx") - usage := s.GetUsage(3) + usage := s.GetUsage() assert.DeepEqual(t, []string{ `{"command":"ps","context":"moby","source":"cli","status":"success"}`, `{"command":"version","context":"moby","source":"cli","status":"success"}`, @@ -185,7 +185,7 @@ func TestContextMetrics(t *testing.T) { c.RunDockerCmd("context", "use", "default") c.RunDockerCmd("--context", "test-example", "ps") - usage := s.GetUsage(7) + usage := s.GetUsage() assert.DeepEqual(t, []string{ `{"command":"context create","context":"moby","source":"cli","status":"success"}`, `{"command":"ps","context":"moby","source":"cli","status":"success"}`, diff --git a/tests/framework/mockmetrics.go b/tests/framework/mockmetrics.go index 265518036..541868e9d 100644 --- a/tests/framework/mockmetrics.go +++ b/tests/framework/mockmetrics.go @@ -22,7 +22,6 @@ import ( "net" "net/http" "strings" - "time" "github.com/labstack/echo" ) @@ -42,8 +41,7 @@ func NewMetricsServer(socket string) *MockMetricsServer { } } -// Handler -func (s *MockMetricsServer) hello(c echo.Context) error { +func (s *MockMetricsServer) handlePostUsage(c echo.Context) error { body, error := ioutil.ReadAll(c.Request().Body) if error != nil { return error @@ -54,10 +52,7 @@ func (s *MockMetricsServer) hello(c echo.Context) error { } // GetUsage get usage -func (s *MockMetricsServer) GetUsage(expectedCommands int) []string { - if len(s.usage) < expectedCommands { - time.Sleep(1 * time.Second) // a simple sleep 1s here should be enough, if not there are real issues - } +func (s *MockMetricsServer) GetUsage() []string { return s.usage } @@ -79,7 +74,7 @@ func (s *MockMetricsServer) Start() { log.Fatal(err) } s.e.Listener = listener - s.e.POST("/usage", s.hello) + s.e.POST("/usage", s.handlePostUsage) _ = s.e.Start(":1323") }() } From 5ba052227110a4834251ee88b109885ee4644e76 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 17 Dec 2020 16:40:12 +0100 Subject: [PATCH 2/3] Wait for mock metrics server to have started before running commands Signed-off-by: Guillaume Tardif --- tests/framework/mockmetrics.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/framework/mockmetrics.go b/tests/framework/mockmetrics.go index 541868e9d..90ee9799b 100644 --- a/tests/framework/mockmetrics.go +++ b/tests/framework/mockmetrics.go @@ -22,6 +22,7 @@ import ( "net" "net/http" "strings" + "time" "github.com/labstack/echo" ) @@ -77,4 +78,7 @@ func (s *MockMetricsServer) Start() { s.e.POST("/usage", s.handlePostUsage) _ = s.e.Start(":1323") }() + + // wait a bit for the mock metrics server to actually listen + time.Sleep(500 * time.Millisecond) } From 57fbd81772d33ea5adebe615ddf4f6036f042af5 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 17 Dec 2020 17:15:48 +0100 Subject: [PATCH 3/3] Make sure mock metrics server is started before testing metrics Signed-off-by: Guillaume Tardif --- tests/e2e/e2e_test.go | 12 ++++++++++++ tests/framework/mockmetrics.go | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index eb49bc693..9e61638a2 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -144,6 +144,18 @@ func TestContextMetrics(t *testing.T) { s.Start() defer s.Stop() + started := false + for i := 0; i < 30; i++ { + c.RunDockerCmd("help", "ps") + if len(s.GetUsage()) > 0 { + started = true + fmt.Printf(" [%s] Server up in %d ms\n", t.Name(), i*100) + break + } + time.Sleep(100 * time.Millisecond) + } + assert.Assert(t, started, "Metrics mock server not available after 3 secs") + t.Run("send metrics on help commands", func(t *testing.T) { s.ResetUsage() diff --git a/tests/framework/mockmetrics.go b/tests/framework/mockmetrics.go index 90ee9799b..541868e9d 100644 --- a/tests/framework/mockmetrics.go +++ b/tests/framework/mockmetrics.go @@ -22,7 +22,6 @@ import ( "net" "net/http" "strings" - "time" "github.com/labstack/echo" ) @@ -78,7 +77,4 @@ func (s *MockMetricsServer) Start() { s.e.POST("/usage", s.handlePostUsage) _ = s.e.Start(":1323") }() - - // wait a bit for the mock metrics server to actually listen - time.Sleep(500 * time.Millisecond) }