tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trying to fix flakyness on metrics e2e tests 

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2020-12-09 16:25:32 +01:00
parent a95a76291b
commit 177b91adc8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/e2e/e2e_test.go
View File

@ -151,7 +151,7 @@ func TestContextMetrics(t *testing.T) {
c.RunDockerCmd("--help") c.RunDockerCmd("--help")
c.RunDockerCmd("run", "--help") c.RunDockerCmd("run", "--help")
usage := s.GetUsage() usage := s.GetUsage(3)
assert.DeepEqual(t, []string{ assert.DeepEqual(t, []string{
`{"command":"help run","context":"moby","source":"cli","status":"success"}`, `{"command":"help run","context":"moby","source":"cli","status":"success"}`,
`{"command":"--help","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.RunDockerCmd("version")
c.RunDockerOrExitError("version", "--xxx") c.RunDockerOrExitError("version", "--xxx")
usage := s.GetUsage() usage := s.GetUsage(3)
assert.DeepEqual(t, []string{ assert.DeepEqual(t, []string{
`{"command":"ps","context":"moby","source":"cli","status":"success"}`, `{"command":"ps","context":"moby","source":"cli","status":"success"}`,
`{"command":"version","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", "use", "default")
c.RunDockerCmd("--context", "test-example", "ps") c.RunDockerCmd("--context", "test-example", "ps")
usage := s.GetUsage() usage := s.GetUsage(7)
assert.DeepEqual(t, []string{ assert.DeepEqual(t, []string{
`{"command":"context create","context":"moby","source":"cli","status":"success"}`, `{"command":"context create","context":"moby","source":"cli","status":"success"}`,
`{"command":"ps","context":"moby","source":"cli","status":"success"}`, `{"command":"ps","context":"moby","source":"cli","status":"success"}`,

6
tests/framework/mockmetrics.go
View File

@ -22,6 +22,7 @@ import (
"net" "net"
"net/http" "net/http"
"strings" "strings"
"time"
"github.com/labstack/echo" "github.com/labstack/echo"
) )
@ -53,7 +54,10 @@ func (s *MockMetricsServer) hello(c echo.Context) error {
} }
// GetUsage get usage // GetUsage get usage
func (s *MockMetricsServer) GetUsage() []string { 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
}
return s.usage return s.usage
} }