mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-04 06:25:32 +00:00
silverwind
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 <[email protected]> Co-authored-by: silverwind <[email protected]>
104 lines
2.8 KiB
Go
104 lines
2.8 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//go:build e2e
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestCompatibility(t *testing.T) {
|
|
if skipReason != "" {
|
|
t.Skip(skipReason)
|
|
}
|
|
|
|
sharedPoller := startRunner(t, "", "ubuntu-latest", runnerOptions{capacity: 16})
|
|
t.Cleanup(func() {
|
|
select {
|
|
case <-sharedPoller.Done():
|
|
t.Error("shared runner stopped")
|
|
default:
|
|
}
|
|
})
|
|
|
|
t.Run("payloads", testPayloads)
|
|
t.Run("cache_and_artifacts", testCacheAndArtifactRoundTrips)
|
|
t.Run("cancellation_and_log_streaming", testRunCancellation)
|
|
t.Run("dispatch", testWorkflowDispatch)
|
|
t.Run("builtin_checkout", testBuiltinCheckout)
|
|
t.Run("moving_action_ref", testMovingActionRef)
|
|
t.Run("ephemeral", testEphemeralRunner)
|
|
t.Run("kubernetes", testKubernetes)
|
|
}
|
|
|
|
func testPayloads(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := t.Context()
|
|
const secretValue = "s3cr3t-value-xyz"
|
|
|
|
api, repo := newScenario(t)
|
|
if err := api.CreateSecret(ctx, repo, "FOO", secretValue); err != nil {
|
|
t.Fatalf("create secret: %v", err)
|
|
}
|
|
if err := api.CreateVariable(ctx, repo, "GREETING", "hello-from-a-variable"); err != nil {
|
|
t.Fatalf("create variable: %v", err)
|
|
}
|
|
if err := api.CreateVariable(ctx, repo, "E2E_SERVICE_IMAGE", os.Getenv("SERVICE_IMAGE")); err != nil {
|
|
t.Fatalf("create service image variable: %v", err)
|
|
}
|
|
pushWorkflow(t, api, repo, "payloads.yml")
|
|
|
|
wfRun := waitForRun(t, api, repo)
|
|
requireSuccess(t, api, repo, wfRun.ID)
|
|
|
|
logs := runLogs(t, api, repo, wfRun.ID)
|
|
for _, want := range []string{
|
|
"hello-from-a-variable",
|
|
"plain-100%-done;-[bracket]",
|
|
"multiline-first",
|
|
"multiline-second",
|
|
"notice-payload-here",
|
|
"warning-payload-here",
|
|
"error-payload-here",
|
|
"group-payload-here",
|
|
"inside-the-group",
|
|
"received=produced-value-42",
|
|
"cell-a-1",
|
|
"cell-a-2",
|
|
"cell-b-1",
|
|
"cell-b-2",
|
|
"imageless env=imageless-env-value host=imageless-host",
|
|
} {
|
|
if !strings.Contains(logs, want) {
|
|
t.Errorf("stored logs are missing %q", want)
|
|
}
|
|
}
|
|
if forwarded := commandRow(logs, "::notice::encoded-first"); forwarded != "::notice::encoded-first%0Aencoded-second" {
|
|
t.Errorf("forwarded command row is %q, want its payload passed through unchanged", forwarded)
|
|
}
|
|
if !strings.Contains(logs, "plain-100%25-done") {
|
|
t.Error("the emitted command did not escape %")
|
|
}
|
|
if strings.Contains(logs, secretValue) || !strings.Contains(logs, "***") {
|
|
t.Error("job logs did not mask the secret")
|
|
}
|
|
|
|
if t.Failed() {
|
|
t.Logf("full stored logs:\n%s", logs)
|
|
}
|
|
}
|
|
|
|
func commandRow(logs, prefix string) string {
|
|
for line := range strings.SplitSeq(logs, "\n") {
|
|
_, payload, found := strings.Cut(line, "Z ")
|
|
if found && strings.HasPrefix(strings.TrimRight(payload, "\r"), prefix) {
|
|
return strings.TrimRight(payload, "\r")
|
|
}
|
|
}
|
|
return ""
|
|
}
|