mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-06-12 08:09:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

test(cli): fixed test flake in TestServerControl (#1717)

Browse Source
This commit is contained in:
Jarek Kowalski
2022-02-02 18:44:48 -08:00
committed by GitHub
parent 6f55e65cbd
commit e15852af41
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cli/command_server_control_test.go
View File

@@ -49,14 +49,17 @@ func TestServerControl(t *testing.T) {
t.Fatalf("server did not start in time")
}
time.Sleep(time.Second)
const (
pollFrequency = 100 * time.Millisecond
waitTimeout = 5 * time.Second
)
lines := env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
require.Len(t, lines, 2)
require.Contains(t, lines, "IDLE: test-user@test-host:"+dir1)
require.Contains(t, lines, "IDLE: test-user@test-host:"+dir2)
require.Eventually(t, func() bool {
lines := env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
return hasLine(lines, "IDLE: test-user@test-host:"+dir1) && hasLine(lines, "IDLE: test-user@test-host:"+dir2)
}, waitTimeout, pollFrequency)
lines = env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword, "--remote")
lines := env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword, "--remote")
require.Len(t, lines, 3)
require.Contains(t, lines, "IDLE: test-user@test-host:"+dir1)
require.Contains(t, lines, "IDLE: test-user@test-host:"+dir2)
@@ -66,9 +69,11 @@ func TestServerControl(t *testing.T) {
env.RunAndExpectSuccess(t, "snap", "create", dir3)
env.RunAndExpectSuccess(t, "server", "refresh", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
lines = env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword, "--remote")
require.Len(t, lines, 4)
require.Contains(t, lines, "IDLE: test-user@test-host:"+dir3)
require.Eventually(t, func() bool {
return hasLine(
env.RunAndExpectSuccess(t, "server", "status", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword, "--remote"),
"IDLE: test-user@test-host:"+dir3)
}, waitTimeout, pollFrequency)
env.RunAndExpectSuccess(t, "server", "flush", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
@@ -102,3 +107,13 @@ func TestServerControl(t *testing.T) {
env.RunAndExpectFailure(t, "server", "refresh", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
env.RunAndExpectFailure(t, "server", "shutdown", "--address", sp.BaseURL, "--server-control-password", sp.ServerControlPassword)
}
func hasLine(lines []string, lookFor string) bool {
for _, l := range lines {
if l == lookFor {
return true
}
}
return false
}