Skip to content

Missed defer prepareTestEnv #9285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 8, 2019
Merged

Missed defer prepareTestEnv #9285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
269f1d5
onGiteaRun should defer the cleanup from prepareTestEnv
zeripath Dec 7, 2019
f745d64
Some more missed defers
zeripath Dec 7, 2019
c070ce0
Merge branch 'master' into testlogger-race
zeripath Dec 7, 2019
5a5265d
Merge branch 'master' into testlogger-race
lafriks Dec 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integrations/benchmarks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func BenchmarkRepo(b *testing.B) {
{url: "https://github.com/golang/go.git", name: "go", skipShort: true},
{url: "https://github.com/torvalds/linux.git", name: "linux", skipShort: true},
}
prepareTestEnv(b)
defer prepareTestEnv(b)()
session := loginUser(b, "user2")
b.ResetTimer()

Expand Down Expand Up @@ -75,7 +75,7 @@ func StringWithCharset(length int, charset string) string {

func BenchmarkRepoBranchCommit(b *testing.B) {
samples := []int64{1, 3, 15, 16}
prepareTestEnv(b)
defer prepareTestEnv(b)()
b.ResetTimer()

for _, repoID := range samples {
Expand Down
2 changes: 1 addition & 1 deletion integrations/git_helper_for_declarative_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func allowLFSFilters() []string {

func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bool) {
if len(prepare) == 0 || prepare[0] {
prepareTestEnv(t, 1)
defer prepareTestEnv(t, 1)()
}
s := http.Server{
Handler: mac,
Expand Down
2 changes: 1 addition & 1 deletion integrations/gpg_git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func TestGPGGit(t *testing.T) {
prepareTestEnv(t)
defer prepareTestEnv(t)()
username := "user2"

// OK Set a new GPG home
Expand Down