From aeb483a08155caa5f0e423bb41b3c22d101485b9 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Wed, 19 Jan 2022 17:12:23 -0800 Subject: [PATCH] fix(testing): fixed robustness tests (#1661) Fixes #1660 Broken by #1644 --- tests/tools/kopiarunner/kopia_snapshotter.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/tools/kopiarunner/kopia_snapshotter.go b/tests/tools/kopiarunner/kopia_snapshotter.go index 4444ced9c..7e7b32477 100644 --- a/tests/tools/kopiarunner/kopia_snapshotter.go +++ b/tests/tools/kopiarunner/kopia_snapshotter.go @@ -29,8 +29,7 @@ const ( retryCount = 180 retryInterval = 1 * time.Second waitingForServerString = "waiting for server to start" - serverUser = "server-user@host" - serverPassword = "abcdef" + serverControlPassword = "abcdef" // Flag value settings. contentCacheSizeSettingMB = 500 @@ -212,8 +211,7 @@ func (ks *KopiaSnapshotter) CreateServer(addr string, args ...string) (*exec.Cmd args = append([]string{ "server", "start", "--address", addr, - "--server-username", serverUser, - "--server-password", serverPassword, + "--server-control-password", serverControlPassword, }, args...) return ks.Runner.RunAsync(args...) @@ -257,8 +255,7 @@ func (ks *KopiaSnapshotter) RefreshServer(addr, fingerprint string, args ...stri "server", "refresh", "--address", addr, "--server-cert-fingerprint", fingerprint, - "--server-username", serverUser, - "--server-password", serverPassword, + "--server-control-password", serverControlPassword, }, args...) _, _, err := ks.Runner.Run(args...) @@ -344,8 +341,7 @@ func (ks *KopiaSnapshotter) waitUntilServerStarted(ctx context.Context, addr, fi "server", "status", "--address", addr, "--server-cert-fingerprint", fingerprint, - "--server-username", serverUser, - "--server-password", serverPassword, + "--server-control-password", serverControlPassword, }, serverStatusArgs...) if err := retry.PeriodicallyNoValue(ctx, retryInterval, retryCount, waitingForServerString, func() error {