From c28e29fd94032aa2804b57512115cd9c5fe76398 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 13 Aug 2023 00:30:16 +0800 Subject: [PATCH] Refactor tests (#26464) 1. Give the global variable clear names 2. Use generic parameter for `onGiteaRun` --- cmd/web.go | 4 +- tests/e2e/e2e_test.go | 4 +- tests/e2e/utils_e2e_test.go | 2 +- .../api_activitypub_person_test.go | 14 +-- tests/integration/api_nodeinfo_test.go | 4 +- .../integration/api_repo_file_create_test.go | 19 ++- tests/integration/benchmarks_test.go | 4 +- tests/integration/create_no_session_test.go | 4 +- .../git_helper_for_declarative_test.go | 14 +-- tests/integration/gpg_git_test.go | 111 +++++------------- tests/integration/integration_test.go | 10 +- tests/test_utils.go | 2 +- 12 files changed, 65 insertions(+), 127 deletions(-) diff --git a/cmd/web.go b/cmd/web.go index b69769ec4..01386251b 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -208,8 +208,8 @@ func serveInstalled(ctx *cli.Context) error { } // Set up Chi routes - c := routers.NormalRoutes() - err := listen(c, true) + webRoutes := routers.NormalRoutes() + err := listen(webRoutes, true) <-graceful.GetManager().Done() log.Info("PID: %d Gitea Web Finished", os.Getpid()) log.GetManager().Close() diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index c4b0b6219..df4fe95fd 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -28,7 +28,7 @@ import ( "code.gitea.io/gitea/tests" ) -var c *web.Route +var testE2eWebRoutes *web.Route func TestMain(m *testing.M) { defer log.GetManager().Close() @@ -38,7 +38,7 @@ func TestMain(m *testing.M) { defer cancel() tests.InitTest(false) - c = routers.NormalRoutes() + testE2eWebRoutes = routers.NormalRoutes() os.Unsetenv("GIT_AUTHOR_NAME") os.Unsetenv("GIT_AUTHOR_EMAIL") diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index e6e35c474..efb4a6ba8 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -22,7 +22,7 @@ func onGiteaRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ... defer tests.PrepareTestEnv(t, 1)() } s := http.Server{ - Handler: c, + Handler: testE2eWebRoutes, } u, err := url.Parse(setting.AppURL) diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index a1ce80270..1a8a38ce5 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -22,10 +22,10 @@ import ( func TestActivityPubPerson(t *testing.T) { setting.Federation.Enabled = true - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() defer func() { setting.Federation.Enabled = false - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() }() onGiteaRun(t, func(*testing.T, *url.URL) { @@ -60,10 +60,10 @@ func TestActivityPubPerson(t *testing.T) { func TestActivityPubMissingPerson(t *testing.T) { setting.Federation.Enabled = true - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() defer func() { setting.Federation.Enabled = false - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() }() onGiteaRun(t, func(*testing.T, *url.URL) { @@ -75,13 +75,13 @@ func TestActivityPubMissingPerson(t *testing.T) { func TestActivityPubPersonInbox(t *testing.T) { setting.Federation.Enabled = true - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() defer func() { setting.Federation.Enabled = false - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() }() - srv := httptest.NewServer(c) + srv := httptest.NewServer(testWebRoutes) defer srv.Close() onGiteaRun(t, func(*testing.T, *url.URL) { diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index f8f50bf07..a347ec5b3 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -17,10 +17,10 @@ import ( func TestNodeinfo(t *testing.T) { setting.Federation.Enabled = true - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() defer func() { setting.Federation.Enabled = false - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() }() onGiteaRun(t, func(*testing.T, *url.URL) { diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 2433a68c3..c48abe7f0 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -110,14 +110,14 @@ func getExpectedFileResponseForCreate(repoFullName, commitID, treePath, latestCo } func BenchmarkAPICreateFileSmall(b *testing.B) { - onGiteaRunTB(b, func(t testing.TB, u *url.URL) { - b := t.(*testing.B) - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 - repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo + onGiteaRun(b, func(b *testing.B, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(b, &user_model.User{ID: 2}) // owner of the repo1 & repo16 + repo1 := unittest.AssertExistsAndLoadBean(b, &repo_model.Repository{ID: 1}) // public repo + b.ResetTimer() for n := 0; n < b.N; n++ { treePath := fmt.Sprintf("update/file%d.txt", n) - createFileInBranch(user2, repo1, treePath, repo1.DefaultBranch, treePath) + _, _ = createFileInBranch(user2, repo1, treePath, repo1.DefaultBranch, treePath) } }) } @@ -125,16 +125,15 @@ func BenchmarkAPICreateFileSmall(b *testing.B) { func BenchmarkAPICreateFileMedium(b *testing.B) { data := make([]byte, 10*1024*1024) - onGiteaRunTB(b, func(t testing.TB, u *url.URL) { - b := t.(*testing.B) - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 - repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo + onGiteaRun(b, func(b *testing.B, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(b, &user_model.User{ID: 2}) // owner of the repo1 & repo16 + repo1 := unittest.AssertExistsAndLoadBean(b, &repo_model.Repository{ID: 1}) // public repo b.ResetTimer() for n := 0; n < b.N; n++ { treePath := fmt.Sprintf("update/file%d.txt", n) copy(data, treePath) - createFileInBranch(user2, repo1, treePath, repo1.DefaultBranch, treePath) + _, _ = createFileInBranch(user2, repo1, treePath, repo1.DefaultBranch, treePath) } }) } diff --git a/tests/integration/benchmarks_test.go b/tests/integration/benchmarks_test.go index 2f91f8273..7a882fe83 100644 --- a/tests/integration/benchmarks_test.go +++ b/tests/integration/benchmarks_test.go @@ -24,9 +24,7 @@ func StringWithCharset(length int, charset string) string { } func BenchmarkRepoBranchCommit(b *testing.B) { - onGiteaRunTB(b, func(t testing.TB, u *url.URL) { - b := t.(*testing.B) - + onGiteaRun(b, func(b *testing.B, u *url.URL) { samples := []int64{1, 2, 3} b.ResetTimer() diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index 535d0d495..601f5e173 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -56,7 +56,7 @@ func TestSessionFileCreation(t *testing.T) { oldSessionConfig := setting.SessionConfig.ProviderConfig defer func() { setting.SessionConfig.ProviderConfig = oldSessionConfig - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() }() var config session.Options @@ -75,7 +75,7 @@ func TestSessionFileCreation(t *testing.T) { setting.SessionConfig.ProviderConfig = string(newConfigBytes) - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() t.Run("NoSessionOnViewIssue", func(t *testing.T) { defer tests.PrintCurrentTest(t)() diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index 1e9978309..10cf79b9f 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -57,12 +57,10 @@ func createSSHUrl(gitPath string, u *url.URL) *url.URL { return &u2 } -func onGiteaRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ...bool) { - if len(prepare) == 0 || prepare[0] { - defer tests.PrepareTestEnv(t, 1)() - } +func onGiteaRun[T testing.TB](t T, callback func(T, *url.URL)) { + defer tests.PrepareTestEnv(t, 1)() s := http.Server{ - Handler: c, + Handler: testWebRoutes, } u, err := url.Parse(setting.AppURL) @@ -89,12 +87,6 @@ func onGiteaRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ... callback(t, u) } -func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bool) { - onGiteaRunTB(t, func(t testing.TB, u *url.URL) { - callback(t.(*testing.T), u) - }, prepare...) -} - func doGitClone(dstLocalPath string, u *url.URL) func(*testing.T) { return func(t *testing.T) { assert.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstLocalPath, git.CloneRepoOptions{})) diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go index 10174b99f..6d67bec09 100644 --- a/tests/integration/gpg_git_test.go +++ b/tests/integration/gpg_git_test.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -24,12 +25,7 @@ import ( ) func TestGPGGit(t *testing.T) { - defer tests.PrepareTestEnv(t)() - username := "user2" - - // OK Set a new GPG home - tmpDir := t.TempDir() - + tmpDir := t.TempDir() // use a temp dir to avoid messing with the user's GPG keyring err := os.Chmod(tmpDir, 0o700) assert.NoError(t, err) @@ -40,31 +36,20 @@ func TestGPGGit(t *testing.T) { // Need to create a root key rootKeyPair, err := importTestingKey(tmpDir, "gitea", "gitea@fake.local") - assert.NoError(t, err) - if err != nil { - assert.FailNow(t, "Unable to import rootKeyPair") + if !assert.NoError(t, err, "importTestingKey") { + return } - rootKeyID := rootKeyPair.PrimaryKey.KeyIdShortString() + defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())() + defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "gitea")() + defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "gitea@fake.local")() + defer test.MockVariableValue(&setting.Repository.Signing.InitialCommit, []string{"never"})() + defer test.MockVariableValue(&setting.Repository.Signing.CRUDActions, []string{"never"})() - oldKeyID := setting.Repository.Signing.SigningKey - oldName := setting.Repository.Signing.SigningName - oldEmail := setting.Repository.Signing.SigningEmail - defer func() { - setting.Repository.Signing.SigningKey = oldKeyID - setting.Repository.Signing.SigningName = oldName - setting.Repository.Signing.SigningEmail = oldEmail - }() - - setting.Repository.Signing.SigningKey = rootKeyID - setting.Repository.Signing.SigningName = "gitea" - setting.Repository.Signing.SigningEmail = "gitea@fake.local" + username := "user2" user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username}) - - setting.Repository.Signing.InitialCommit = []string{"never"} - setting.Repository.Signing.CRUDActions = []string{"never"} - baseAPITestContext := NewAPITestContext(t, username, "repo1") + onGiteaRun(t, func(t *testing.T, u *url.URL) { u.Path = baseAPITestContext.GitPath() @@ -87,11 +72,8 @@ func TestGPGGit(t *testing.T) { assert.False(t, response.Verification.Verified) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -104,11 +86,8 @@ func TestGPGGit(t *testing.T) { assert.False(t, response.Verification.Verified) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"never"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"never"} t.Run("Unsigned-Initial-CRUD-Never", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -117,11 +96,8 @@ func TestGPGGit(t *testing.T) { assert.False(t, response.Verification.Verified) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"always"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"always"} t.Run("Unsigned-Initial-CRUD-Always", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -154,11 +130,8 @@ func TestGPGGit(t *testing.T) { assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -177,11 +150,8 @@ func TestGPGGit(t *testing.T) { assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) })) }) - }, false) - setting.Repository.Signing.InitialCommit = []string{"always"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.InitialCommit = []string{"always"} t.Run("AlwaysSign-Initial", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -205,11 +175,8 @@ func TestGPGGit(t *testing.T) { assert.Equal(t, "gitea@fake.local", branch.Commit.Verification.Signer.Email) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"never"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"never"} t.Run("AlwaysSign-Initial-CRUD-Never", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-always-never", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -219,10 +186,8 @@ func TestGPGGit(t *testing.T) { assert.False(t, response.Verification.Verified) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} t.Run("AlwaysSign-Initial-CRUD-ParentSigned-On-Always", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-always-parent", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -237,11 +202,8 @@ func TestGPGGit(t *testing.T) { assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) })) }) - }, false) - setting.Repository.Signing.CRUDActions = []string{"always"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.CRUDActions = []string{"always"} t.Run("AlwaysSign-Initial-CRUD-Always", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-always-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) @@ -256,21 +218,16 @@ func TestGPGGit(t *testing.T) { assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) })) }) - }, false) - var pr api.PullRequest - setting.Repository.Signing.Merges = []string{"commitssigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.Merges = []string{"commitssigned"} t.Run("UnsignedMerging", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - var err error t.Run("CreatePullRequest", func(t *testing.T) { - pr, err = doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t) + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t) assert.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) }) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { assert.NotNil(t, branch.Commit) assert.NotNil(t, branch.Commit.Verification) @@ -278,20 +235,16 @@ func TestGPGGit(t *testing.T) { assert.Empty(t, branch.Commit.Verification.Signature) })) }) - }, false) - setting.Repository.Signing.Merges = []string{"basesigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.Merges = []string{"basesigned"} t.Run("BaseSignedMerging", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - var err error t.Run("CreatePullRequest", func(t *testing.T) { - pr, err = doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t) + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t) assert.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) }) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { assert.NotNil(t, branch.Commit) assert.NotNil(t, branch.Commit.Verification) @@ -299,27 +252,23 @@ func TestGPGGit(t *testing.T) { assert.Empty(t, branch.Commit.Verification.Signature) })) }) - }, false) - setting.Repository.Signing.Merges = []string{"commitssigned"} - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() + setting.Repository.Signing.Merges = []string{"commitssigned"} t.Run("CommitsSignedMerging", func(t *testing.T) { defer tests.PrintCurrentTest(t)() testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - var err error t.Run("CreatePullRequest", func(t *testing.T) { - pr, err = doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t) + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t) assert.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) }) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { assert.NotNil(t, branch.Commit) assert.NotNil(t, branch.Commit.Verification) assert.True(t, branch.Commit.Verification.Verified) })) }) - }, false) + }) } func crudActionCreateFile(t *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index c904d32ff..76a65e3f0 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -40,7 +40,7 @@ import ( "github.com/xeipuuv/gojsonschema" ) -var c *web.Route +var testWebRoutes *web.Route type NilResponseRecorder struct { httptest.ResponseRecorder @@ -87,7 +87,7 @@ func TestMain(m *testing.M) { defer cancel() tests.InitTest(true) - c = routers.NormalRoutes() + testWebRoutes = routers.NormalRoutes() // integration test settings... if setting.CfgProvider != nil { @@ -374,7 +374,7 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest. if req.RemoteAddr == "" { req.RemoteAddr = "test-mock:12345" } - c.ServeHTTP(recorder, req) + testWebRoutes.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { logUnexpectedResponse(t, recorder) @@ -386,7 +386,7 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest. func MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseRecorder { t.Helper() recorder := NewNilResponseRecorder() - c.ServeHTTP(recorder, req) + testWebRoutes.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { @@ -399,7 +399,7 @@ func MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedSta func MakeRequestNilResponseHashSumRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseHashSumRecorder { t.Helper() recorder := NewNilResponseHashSumRecorder() - c.ServeHTTP(recorder, req) + testWebRoutes.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { diff --git a/tests/test_utils.go b/tests/test_utils.go index 6ac61db63..089b4dce1 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -181,7 +181,7 @@ func InitTest(requireGitea bool) { func PrepareTestEnv(t testing.TB, skip ...int) func() { t.Helper() - ourSkip := 2 + ourSkip := 1 if len(skip) > 0 { ourSkip += skip[0] }