test: run integration tests on random ports and speed up slow tests (#39842)

Integration test processes now get their own work directory, config file
and random ports, so several runs can execute in parallel on one
machine. The slowest tests also lose fixed sleeps and needlessly
expensive setup, with their assertions kept.

- Batch PostgreSQL sequence resets, the main per-test fixture cost there
- Cheap hashing params in hash and OAuth2 fixture tests, full-cost
vectors stay
- Single fetch for negative Actions runner assertions instead of 1s
polls
- Queue flushes and backdated timestamps instead of sleeps
- In-memory SQLite test journal, tmpfs for PostgreSQL in CI
- E2E instance writes SSH keys into its work directory instead of
`~/.ssh/authorized_keys`
This commit is contained in:
silverwind authored and GitHub committed 2026-10-18 12:56:04 +00:00
1 parent d0c35bcd58
commit 1031e34987
42 files changed
+219 -179

No files matched your search

+13 -2
View File
@@ -75,7 +75,18 @@ func TestHashing(t *testing.T) {
for _, algorithmName := range hashAlgorithmsToTest {
t.Run(algorithmName, func(t *testing.T) {
t.Parallel() // CPU-bound; these subtests only read the shared hasher registry
output, err := Parse(algorithmName).Hash(password, salt)
algorithm := *Parse(algorithmName)
switch algorithm.PasswordSaltHasher.(type) {
case *Argon2Hasher:
algorithm.PasswordSaltHasher = NewArgon2Hasher("2$64$8$50")
case *BcryptHasher:
algorithm.PasswordSaltHasher = NewBcryptHasher("4")
case *PBKDF2Hasher:
algorithm.PasswordSaltHasher = NewPBKDF2Hasher("1$50")
case *ScryptHasher:
algorithm.PasswordSaltHasher = NewScryptHasher("16$16$2$50")
}
output, err := algorithm.Hash(password, salt)
if shouldPass {
assert.NoError(t, err)
assert.NotEmpty(t, output, "output for %s was empty", algorithmName)
@@ -83,7 +94,7 @@ func TestHashing(t *testing.T) {
assert.Error(t, err)
}
assert.Equal(t, Parse(algorithmName).VerifyPassword(password, output, salt), shouldPass)
assert.Equal(t, algorithm.VerifyPassword(password, output, salt), shouldPass)
})
}
}
@@ -8,6 +8,7 @@
package tests
import (
"context"
"fmt"
"slices"
"testing"
@@ -744,6 +745,9 @@ func countIndexerData(data map[int64]*internal.IndexerData, f func(v *internal.I
// waitData waits for the indexer to index all data.
// Some engines like Elasticsearch index data asynchronously, so we need to wait for a while.
func waitData(t *testing.T, indexer internal.Indexer, total int64) {
if refresher, ok := indexer.(interface{ Refresh(context.Context) error }); ok {
require.NoError(t, refresher.Refresh(t.Context()))
}
assert.Eventually(t, func() bool {
result, err := indexer.Search(t.Context(), &internal.SearchOptions{Paginator: &db.ListOptions{}})
require.NoError(t, err)
@@ -0,0 +1,22 @@
// Copyright 2026 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package migration
import (
"context"
"errors"
"testing"
"github.com/stretchr/testify/assert"
)
func TestRetryDownloaderExhaustsAttempts(t *testing.T) {
failure := errors.New("permission denied")
attempts := 0
assert.ErrorIs(t, NewRetryDownloader(nil, 3, 0).retry(t.Context(), func(_ctx context.Context) error {
attempts++
return failure
}), failure)
assert.Equal(t, 3, attempts)
}
+34 -16
View File
@@ -6,6 +6,7 @@ package setting
import (
"errors"
"fmt"
"net"
"os"
"path/filepath"
"runtime"
@@ -129,40 +130,58 @@ func SetupGiteaTestEnv() {
_ = os.Setenv("GITEA_CONF", giteaConf) // test fixture git hooks use "$GITEA_ROOT/$GITEA_CONF" in their scripts
}
func PrepareIntegrationTestConfig() error {
// PrepareIntegrationTestConfig isolates each process for parallel runs
func PrepareIntegrationTestConfig() (workPath string, err error) {
giteaTestRoot := detectGiteaTestRoot()
isInCI := os.Getenv("CI") != ""
testDatabase := os.Getenv("GITEA_TEST_DATABASE")
if testDatabase == "" {
if isInCI {
return errors.New("GITEA_TEST_DATABASE environment variable not set")
return "", errors.New("GITEA_TEST_DATABASE environment variable not set")
}
// for local development, default to sqlite. CI needs to explicitly set a database to avoid unexpected results
testDatabase = "sqlite"
_, _ = fmt.Fprintf(os.Stderr, "Environment variable GITEA_TEST_DATABASE not set - defaulting to %s\n", testDatabase)
}
_ = os.Setenv("GITEA_TEST_ROOT", giteaTestRoot)
_ = os.Setenv("GITEA_TEST_CONF", filepath.Join("tests", testDatabase+".ini"))
workPath := filepath.Join(giteaTestRoot, "tests/integration/gitea-integration-"+testDatabase)
if err := os.MkdirAll(workPath, 0o755); err != nil {
return err
}
confFile := filepath.Join(giteaTestRoot, "tests", testDatabase+".ini")
tmplBuf, err := os.ReadFile(confFile + ".tmpl")
workPath, err = os.MkdirTemp(filepath.Join(giteaTestRoot, "tests/integration"), "gitea-integration-"+testDatabase+"-")
if err != nil {
return err
return "", err
}
confFile := filepath.Join(workPath, "app.ini")
giteaConf, err := filepath.Rel(giteaTestRoot, confFile)
if err != nil {
return "", err
}
_ = os.Setenv("GITEA_TEST_ROOT", giteaTestRoot)
_ = os.Setenv("GITEA_TEST_CONF", giteaConf)
tmplBuf, err := os.ReadFile(filepath.Join(giteaTestRoot, "tests", testDatabase+".ini.tmpl"))
if err != nil {
return "", err
}
tmpl := string(tmplBuf)
envVars, err := shellquote.Split(os.Getenv("MAKEFILE_VARS"))
if err != nil {
return err
return "", err
}
httpListener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
return "", err
}
defer httpListener.Close()
sshListener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
return "", err
}
defer sshListener.Close()
_, httpPort, _ := net.SplitHostPort(httpListener.Addr().String())
_, sshPort, _ := net.SplitHostPort(sshListener.Addr().String())
envVarMap := map[string]string{
"TEST_WORK_PATH": workPath,
"TEST_LOGGER": "test,file",
"TEST_HTTP_PORT": httpPort,
"TEST_SSH_PORT": sshPort,
}
for _, env := range append(os.Environ(), envVars...) {
k, v, _ := strings.Cut(env, "=")
@@ -173,6 +192,5 @@ func PrepareIntegrationTestConfig() error {
for k, v := range envVarMap {
tmpl = strings.ReplaceAll(tmpl, fmt.Sprintf("{{%s}}", k), v)
}
err = os.WriteFile(confFile, []byte(tmpl), 0o644)
return err
return workPath, os.WriteFile(confFile, []byte(tmpl), 0o644)
}
+1 -1
View File
@@ -223,7 +223,7 @@ func listDirRecursively(result *[]string, fsDir, recordParentPath string, opts *
}
defer dir.Close()
fis, err := dir.Readdir(0)
fis, err := dir.ReadDir(0)
if err != nil {
return err
}
+8 -8
View File
@@ -17,7 +17,7 @@ import (
)
func TestWriterReader(t *testing.T) {
testData := prepareTestData(t, 1_000_000)
testData := prepareTestData(t, 300000)
result := bytes.NewBuffer(nil)
@@ -73,13 +73,13 @@ func TestWriterReader(t *testing.T) {
}
func TestSeekableWriterReader(t *testing.T) {
testData := prepareTestData(t, 2_000_000)
testData := prepareTestData(t, 200000)
result := bytes.NewBuffer(nil)
t.Run("regular", func(t *testing.T) {
result.Reset()
blockSize := 100_000
blockSize := 10000
writer, err := NewSeekableWriter(result, blockSize)
require.NoError(t, err)
@@ -102,7 +102,7 @@ func TestSeekableWriterReader(t *testing.T) {
t.Run("seek read", func(t *testing.T) {
result.Reset()
blockSize := 100_000
blockSize := 10000
writer, err := NewSeekableWriter(result, blockSize)
require.NoError(t, err)
@@ -118,7 +118,7 @@ func TestSeekableWriterReader(t *testing.T) {
reader, err := NewSeekableReader(assertReader)
require.NoError(t, err)
_, err = reader.Seek(1_000_000, io.SeekStart)
_, err = reader.Seek(100000, io.SeekStart)
require.NoError(t, err)
data := make([]byte, 1000)
@@ -126,7 +126,7 @@ func TestSeekableWriterReader(t *testing.T) {
require.NoError(t, err)
require.NoError(t, reader.Close())
assert.Equal(t, testData[1_000_000:1_000_000+1000], data)
assert.Equal(t, testData[100000:100000+1000], data)
// Should seek 3 times,
// the first two times are for getting the index,
@@ -143,7 +143,7 @@ func TestSeekableWriterReader(t *testing.T) {
testData := prepareTestData(t, 1000) // data size is less than a block
result.Reset()
blockSize := 100_000
blockSize := 10000
writer, err := NewSeekableWriter(result, blockSize)
require.NoError(t, err)
@@ -192,7 +192,7 @@ func TestSeekableWriterReader(t *testing.T) {
t.Run("compatible reader", func(t *testing.T) {
result.Reset()
blockSize := 100_000
blockSize := 10000
writer, err := NewSeekableWriter(result, blockSize)
require.NoError(t, err)