mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-17 05:13:42 +00:00
refactor: remove dead code and consolidate tests (#1335)
Removes dead code and redundant logic and consolidates tests, so there is less to read and maintain. No behavior change. 1. **act/runner**: inline single-use wrappers, compile regexes once instead of per call, embed the trampoline as a string, drop the unused legacy result of `parseActionCommand` 2. **act/container**: `sanitizeConfig` and `mergeContainerConfigs` stop returning the configs they already mutate in place, drop never-set option fields and the unused `user` parameter of `ExecWithCmdLine` 3. **act/common and cache server**: drop the unused `Trace`/`Tracef` loggers and the short SHA of `FindGitRevision`, `RegisterJob` releases through `RevokeJob` 4. **daemon, poller and reporter**: one shutdown wait for both poll modes, drop an unreachable fetch timeout branch, guard the reporter's last report time with its existing lock instead of an atomic 5. **build**: drop unused Makefile and release workflow variables, collapse the goreleaser ignore list to the same build targets 6. **tests**: fold near-duplicate tests into tables with shared setup Throughout, hand-rolled logic gives way to `cmp.Or`, `strings.Cut`, `slices` and `min`/`max`. Reviewed-on: https://gitea.com/gitea/runner/pulls/1335 Reviewed-by: bircni <[email protected]> Co-authored-by: silverwind <[email protected]>
This commit is contained in:
1 parent
923a0bfb59
commit
d882311ec6
107 files changed
+2408
-6500
No files matched your search
@@ -8,31 +8,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestRunnerCloneEnvsReturnsTaskLocalCopy(t *testing.T) {
|
||||
r := &Runner{
|
||||
envs: map[string]string{
|
||||
"ACTIONS_CACHE_URL": "http://cache.example",
|
||||
"ACTIONS_RUNTIME_URL": "http://runner.example",
|
||||
},
|
||||
}
|
||||
|
||||
cloned := r.cloneEnvs()
|
||||
require.Equal(t, r.envs, cloned)
|
||||
|
||||
cloned["ACTIONS_RUNTIME_TOKEN"] = "task-token"
|
||||
cloned["ACTIONS_ID_TOKEN_REQUEST_URL"] = "http://oidc.example"
|
||||
|
||||
assert.NotContains(t, r.envs, "ACTIONS_RUNTIME_TOKEN")
|
||||
assert.NotContains(t, r.envs, "ACTIONS_ID_TOKEN_REQUEST_URL")
|
||||
assert.Equal(t, "http://cache.example", r.envs["ACTIONS_CACHE_URL"])
|
||||
}
|
||||
|
||||
// Regression test for #958: concurrent tasks writing task-specific env keys
|
||||
// used to race on the shared r.envs map and crash the runner with
|
||||
// "fatal error: concurrent map writes". Each task must mutate its own clone.
|
||||
func TestRunnerCloneEnvsConcurrentMutation(t *testing.T) {
|
||||
r := &Runner{
|
||||
envs: map[string]string{
|
||||
@@ -48,6 +25,7 @@ func TestRunnerCloneEnvsConcurrentMutation(t *testing.T) {
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
envs := r.cloneEnvs()
|
||||
assert.Equal(t, r.envs, envs)
|
||||
envs["ACTIONS_RUNTIME_TOKEN"] = "task-token"
|
||||
envs["ACTIONS_ID_TOKEN_REQUEST_URL"] = "http://oidc.example"
|
||||
envs["ACTIONS_ID_TOKEN_REQUEST_TOKEN"] = "oidc-token"
|
||||
@@ -55,7 +33,8 @@ func TestRunnerCloneEnvsConcurrentMutation(t *testing.T) {
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
assert.NotContains(t, r.envs, "ACTIONS_RUNTIME_TOKEN")
|
||||
assert.NotContains(t, r.envs, "ACTIONS_ID_TOKEN_REQUEST_URL")
|
||||
assert.NotContains(t, r.envs, "ACTIONS_ID_TOKEN_REQUEST_TOKEN")
|
||||
assert.Equal(t, map[string]string{
|
||||
"ACTIONS_CACHE_URL": "http://cache.example",
|
||||
"ACTIONS_RUNTIME_URL": "http://runner.example",
|
||||
}, r.envs)
|
||||
}
|
||||
Reference in new issue
Block a user