tests: fixed unstable test TestAPI_AgentMonitor (#7561)

Similar fix as https://github.com/hashicorp/consul/pull/7541
This commit is contained in:
Pierre Souchay 2020-04-01 09:47:57 +02:00 committed by GitHub
parent 5fffde3c27
commit f28b18bc5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions

View File

@ -1186,15 +1186,26 @@ func TestAPI_AgentMonitor(t *testing.T) {
t.Fatalf("err: %v", err)
}
// Wait for the first log message and validate it
select {
case log := <-logCh:
if !(strings.Contains(log, "[INFO]") || strings.Contains(log, "[DEBUG]")) {
t.Fatalf("bad: %q", log)
retry.Run(t, func(r *retry.R) {
{
// Register a service to be sure something happens in secs
serviceReg := &AgentServiceRegistration{
Name: "redis",
}
if err := agent.ServiceRegister(serviceReg); err != nil {
r.Fatalf("err: %v", err)
}
}
case <-time.After(10 * time.Second):
t.Fatalf("failed to get a log message")
}
// Wait for the first log message and validate it
select {
case log := <-logCh:
if !(strings.Contains(log, "[INFO]") || strings.Contains(log, "[DEBUG]")) {
r.Fatalf("bad: %q", log)
}
case <-time.After(10 * time.Second):
r.Fatalf("failed to get a log message")
}
})
}
func TestAPI_AgentMonitorJSON(t *testing.T) {