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

removed wait that is not the root cause for metrics flakyness 

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2020-12-17 16:06:28 +01:00
parent 76ba85fe5d
commit 9138a3c76b
2 changed files with 6 additions and 11 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("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"}`,

11
tests/framework/mockmetrics.go
View File

@ -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")
}()
}