From af5ce101efc577bdfb67f733f82888c6de1fd384 Mon Sep 17 00:00:00 2001 From: Romain LE JEUNE Date: Mon, 24 Oct 2022 08:58:23 +0200 Subject: [PATCH] GODT-1645: fix rebase changes --- test/context/users.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/context/users.go b/test/context/users.go index b15c1ae8..70f802df 100644 --- a/test/context/users.go +++ b/test/context/users.go @@ -54,7 +54,7 @@ func (ctx *TestContext) LoginUser(username string, password, mailboxPassword []b } } - user, err := ctx.users.FinishLogin(client, auth, mailboxPassword) + userID, err := ctx.users.FinishLogin(client, auth, mailboxPassword) if err != nil { return errors.Wrap(err, "failed to finish login") } @@ -65,7 +65,7 @@ func (ctx *TestContext) LoginUser(username string, password, mailboxPassword []b logrus.Warn("Pausing user.Logout by 2 minutes to not hit issues with too many login attempts.") time.Sleep(2 * time.Minute) } - return user.Logout() + return ctx.bridge.LogoutUser(userID) }, "Logging out user", ) @@ -83,12 +83,14 @@ func (ctx *TestContext) FinishLogin(client pmapi.Client, mailboxPassword []byte) return errors.New("cannot get current auth tokens from client") } - user, err := ctx.users.FinishLogin(client, c.GetCurrentAuth(), mailboxPassword) + userID, err := ctx.users.FinishLogin(client, c.GetCurrentAuth(), mailboxPassword) if err != nil { return errors.Wrap(err, "failed to finish login") } - ctx.addCleanupChecked(user.Logout, "Logging out user") + ctx.addCleanupChecked(func() error { + return ctx.bridge.LogoutUser(userID) + }, "Logging out user") return nil }