thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[F3] GetAdminUser now has a ctx argument

Browse source 
(cherry picked from commit 37357a92af)
This commit is contained in:
Earl Warren 2023-07-03 10:10:10 +02:00
parent 846a522ecc
commit 660bc1673c
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/f3.go
View file

@ -85,7 +85,7 @@ func getAuthenticationSource(ctx context.Context, authenticationSource string) (
} }
func RunF3(stdCtx context.Context, ctx *cli.Context) error { func RunF3(stdCtx context.Context, ctx *cli.Context) error {
doer, err := user_model.GetAdminUser() doer, err := user_model.GetAdminUser(stdCtx)
if err != nil { if err != nil {
return err return err
} }

4
tests/integration/f3_test.go
View file

@ -77,7 +77,7 @@ func TestF3(t *testing.T) {
// //
// Step 2: mirror the fixture into Forgejo // Step 2: mirror the fixture into Forgejo
// //
doer, err := user_model.GetAdminUser() doer, err := user_model.GetAdminUser(context.Background())
assert.NoError(t, err) assert.NoError(t, err)
forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, 0) forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, 0)
options := f3_common.NewMirrorOptionsRecurse() options := f3_common.NewMirrorOptionsRecurse()
@ -233,7 +233,7 @@ func TestF3UserMapping(t *testing.T) {
} }
defer createUser(context.Background(), t, gitlabUser)() defer createUser(context.Background(), t, gitlabUser)()
doer, err := user_model.GetAdminUser() doer, err := user_model.GetAdminUser(context.Background())
assert.NoError(t, err) assert.NoError(t, err)
forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, gitlab.ID) forgejoLocal := util.ForgejoForgeRoot(gof3.AllFeatures, doer, gitlab.ID)
options := f3_common.NewMirrorOptionsRecurse() options := f3_common.NewMirrorOptionsRecurse()