From 660bc1673c189a16e88bd492947280a6e25fc7dd Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 3 Jul 2023 10:10:10 +0200 Subject: [PATCH] [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) --- cmd/f3.go | 2 +- tests/integration/f3_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/f3.go b/cmd/f3.go index de58702bcf..61da4b6bad 100644 --- a/cmd/f3.go +++ b/cmd/f3.go @@ -85,7 +85,7 @@ func getAuthenticationSource(ctx context.Context, authenticationSource string) ( } func RunF3(stdCtx context.Context, ctx *cli.Context) error { - doer, err := user_model.GetAdminUser() + doer, err := user_model.GetAdminUser(stdCtx) if err != nil { return err } diff --git a/tests/integration/f3_test.go b/tests/integration/f3_test.go index 1c3ab2b02b..b6bafdf850 100644 --- a/tests/integration/f3_test.go +++ b/tests/integration/f3_test.go @@ -77,7 +77,7 @@ func TestF3(t *testing.T) { // // Step 2: mirror the fixture into Forgejo // - doer, err := user_model.GetAdminUser() + doer, err := user_model.GetAdminUser(context.Background()) assert.NoError(t, err) forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, 0) options := f3_common.NewMirrorOptionsRecurse() @@ -233,7 +233,7 @@ func TestF3UserMapping(t *testing.T) { } defer createUser(context.Background(), t, gitlabUser)() - doer, err := user_model.GetAdminUser() + doer, err := user_model.GetAdminUser(context.Background()) assert.NoError(t, err) forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, gitlab.ID) options := f3_common.NewMirrorOptionsRecurse()