diff options
| author | zeripath <art27@cantab.net> | 2021-09-23 16:45:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 23:45:36 +0800 |
| commit | 9302eba971611601c3ebf6024e22a11c63f4e151 (patch) | |
| tree | a3e5583986161ef62e7affc694098279ecf2217d /models/repo_permission_test.go | |
| parent | b22be7f594401d7bd81196750456ce52185bd391 (diff) | |
| download | gitea-9302eba971611601c3ebf6024e22a11c63f4e151.tar.gz gitea-9302eba971611601c3ebf6024e22a11c63f4e151.zip | |
DBContext is just a Context (#17100)
* DBContext is just a Context
This PR removes some of the specialness from the DBContext and makes it context
This allows us to simplify the GetEngine code to wrap around any context in future
and means that we can change our loadRepo(e Engine) functions to simply take contexts.
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fix unit tests
Signed-off-by: Andrew Thornton <art27@cantab.net>
* another place that needs to set the initial context
Signed-off-by: Andrew Thornton <art27@cantab.net>
* avoid race
Signed-off-by: Andrew Thornton <art27@cantab.net>
* change attachment error
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/repo_permission_test.go')
| -rw-r--r-- | models/repo_permission_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/repo_permission_test.go b/models/repo_permission_test.go index 625e0dd205..1fbf1b9f8f 100644 --- a/models/repo_permission_test.go +++ b/models/repo_permission_test.go @@ -16,7 +16,7 @@ func TestRepoPermissionPublicNonOrgRepo(t *testing.T) { // public non-organization repo repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository) - assert.NoError(t, repo.getUnits(db.DefaultContext().Engine())) + assert.NoError(t, repo.getUnits(db.GetEngine(db.DefaultContext))) // plain user user := db.AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) @@ -69,7 +69,7 @@ func TestRepoPermissionPrivateNonOrgRepo(t *testing.T) { // private non-organization repo repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) - assert.NoError(t, repo.getUnits(db.DefaultContext().Engine())) + assert.NoError(t, repo.getUnits(db.GetEngine(db.DefaultContext))) // plain user user := db.AssertExistsAndLoadBean(t, &User{ID: 4}).(*User) @@ -121,7 +121,7 @@ func TestRepoPermissionPublicOrgRepo(t *testing.T) { // public organization repo repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 32}).(*Repository) - assert.NoError(t, repo.getUnits(db.DefaultContext().Engine())) + assert.NoError(t, repo.getUnits(db.GetEngine(db.DefaultContext))) // plain user user := db.AssertExistsAndLoadBean(t, &User{ID: 5}).(*User) @@ -183,7 +183,7 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) { // private organization repo repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 24}).(*Repository) - assert.NoError(t, repo.getUnits(db.DefaultContext().Engine())) + assert.NoError(t, repo.getUnits(db.GetEngine(db.DefaultContext))) // plain user user := db.AssertExistsAndLoadBean(t, &User{ID: 5}).(*User) |