mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-10-30 11:58:49 +08:00
d882311ec6
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 <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io>
40 lines
1.1 KiB
Go
40 lines
1.1 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package process
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
func TestDirContainsPath(t *testing.T) {
|
|
base := filepath.Join("base", "job1")
|
|
|
|
cases := []struct {
|
|
name string
|
|
dir string
|
|
target string
|
|
want bool
|
|
}{
|
|
{"same dir", base, base, true},
|
|
{"direct child", base, filepath.Join(base, "app.exe"), true},
|
|
{"deep child", base, filepath.Join(base, "sub", "sub", "app.exe"), true},
|
|
{"parent is not within child", filepath.Join(base, "sub"), base, false},
|
|
{"name-prefix sibling spared", base, filepath.Join("base", "job10", "app.exe"), false},
|
|
{"unrelated", base, filepath.Join("other", "app.exe"), false},
|
|
{"empty dir", "", base, false},
|
|
{"empty target", base, "", false},
|
|
{"dot dir", ".", base, false},
|
|
{"case-insensitive hit", base, filepath.Join("base", "JOB1", "app.exe"), true},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got := dirContainsPath(tc.dir, tc.target)
|
|
if got != tc.want {
|
|
t.Fatalf("dirContainsPath(%q, %q) = %v, want %v", tc.dir, tc.target, got, tc.want)
|
|
}
|
|
})
|
|
}
|
|
}
|