loading up the forgejo repo on tangled to test page performance
Merge pull request 'chore: fix e2e' (#5977) from gusted/fix-e2e into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5977
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
+12
-3
+10
tests/e2e/utils_e2e_test.go
+10
tests/e2e/utils_e2e_test.go
···
8
8
"net"
9
9
"net/http"
10
10
"net/url"
11
+
"os"
12
+
"regexp"
11
13
"testing"
12
14
"time"
13
15
···
16
18
17
19
"github.com/stretchr/testify/require"
18
20
)
21
+
22
+
var rootPathRe = regexp.MustCompile("\\[repository\\]\nROOT\\s=\\s.*")
19
23
20
24
func onForgejoRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ...bool) {
21
25
if len(prepare) == 0 || prepare[0] {
···
37
41
require.NoError(t, err)
38
42
u.Host = listener.Addr().String()
39
43
44
+
// Override repository root in config.
45
+
conf, err := os.ReadFile(setting.CustomConf)
46
+
require.NoError(t, err)
47
+
require.NoError(t, os.WriteFile(setting.CustomConf, rootPathRe.ReplaceAll(conf, []byte("[repository]\nROOT = "+setting.RepoRootPath)), 0o644))
48
+
40
49
defer func() {
50
+
require.NoError(t, os.WriteFile(setting.CustomConf, conf, 0o644))
41
51
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
42
52
s.Shutdown(ctx)
43
53
cancel()
+2
-2
tests/integration/git_helper_for_declarative_test.go
+2
-2
tests/integration/git_helper_for_declarative_test.go
···
83
83
// Override repository root in config.
84
84
conf, err := os.ReadFile(setting.CustomConf)
85
85
require.NoError(t, err)
86
-
require.NoError(t, os.WriteFile(setting.CustomConf, rootPathRe.ReplaceAll(conf, []byte("[repository]\nROOT = "+setting.RepoRootPath)), os.ModePerm))
86
+
require.NoError(t, os.WriteFile(setting.CustomConf, rootPathRe.ReplaceAll(conf, []byte("[repository]\nROOT = "+setting.RepoRootPath)), 0o600))
87
87
88
88
defer func() {
89
-
require.NoError(t, os.WriteFile(setting.CustomConf, conf, os.ModePerm))
89
+
require.NoError(t, os.WriteFile(setting.CustomConf, conf, 0o600))
90
90
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
91
91
s.Shutdown(ctx)
92
92
cancel()