mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-06-15 22:57:23 +08:00
## Problem Several runner code paths could drop the **tail** of a step's log output, so a failing (or cancelled) step would show output that is missing its last line(s). This was observed in practice and traced to four independent issues. ## Root causes & fixes ### 1. Trailing line without a newline was never flushed `common.lineWriter` buffers output until it sees a `\n`. A final line **without** a trailing newline (e.g. an error message printed right before a process exits, a panic, `printf` without `\n`) stayed in the internal buffer and was never emitted — the writer exposed no flush at all. - Added `lineWriter.Flush()` (idempotent), a `Flusher` interface, and a `FlushWriter(io.Writer)` helper. - Flush at every stream EOF: the exec copy goroutine, the container `attach()` streaming goroutine, and at step end (`useStepLogger`). ### 2. Cancellation/timeout truncated output `waitForCommand` returned immediately on `ctx.Done()` and abandoned the output-copy goroutine, losing output the command had already produced. It now drains with a bounded grace period before returning. The response channel is buffered so the goroutine can't leak if the drain times out. ### 3. `attach()` raced the final bytes Container output was streamed in a fire-and-forget goroutine that `wait()` did not synchronize with, so the step could proceed before the last bytes were written. `wait()` now blocks on the streaming goroutine (bounded) so output is fully drained and flushed first. ### 4. `::stop-commands::` silently dropped lines from the step log Lines between `::stop-commands::<token>` and its end token were echoed without the `raw_output` field **and** short-circuited the handler chain (`return false`), so they never reached the step log (non-raw entries aren't appended while a step is running). Now returns `true` so they are still captured. Reviewed-on: https://gitea.com/gitea/runner/pulls/1028 Reviewed-by: Zettat123 <39446+zettat123@noreply.gitea.com>
217 lines
5.3 KiB
Go
217 lines
5.3 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package runner
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
|
|
"gitea.com/gitea/runner/act/common"
|
|
"gitea.com/gitea/runner/act/model"
|
|
|
|
"github.com/sirupsen/logrus/hooks/test"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSetEnv(t *testing.T) {
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
handler("::set-env name=x::valz\n")
|
|
a.Equal("valz", rc.Env["x"])
|
|
}
|
|
|
|
func TestStopCommandsKeepsSuppressedLinesInLog(t *testing.T) {
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
// Stop command processing until the matching end token is seen.
|
|
a.True(handler("::stop-commands::my-end-token\n"))
|
|
|
|
// A command-shaped line while stopped must not be executed (env unchanged),
|
|
// but must still return true so it reaches the raw_output log handler and is
|
|
// not dropped from the step log.
|
|
a.True(handler("::set-env name=x::valz\n"))
|
|
a.NotContains(rc.Env, "x")
|
|
|
|
// The matching end token resumes command processing.
|
|
a.True(handler("::my-end-token::\n"))
|
|
|
|
// Commands are processed again after resuming.
|
|
a.True(handler("::set-env name=y::valy\n"))
|
|
a.Equal("valy", rc.Env["y"])
|
|
}
|
|
|
|
func TestSetOutput(t *testing.T) {
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
rc := new(RunContext)
|
|
rc.StepResults = make(map[string]*model.StepResult)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
rc.CurrentStep = "my-step"
|
|
rc.StepResults[rc.CurrentStep] = &model.StepResult{
|
|
Outputs: make(map[string]string),
|
|
}
|
|
handler("::set-output name=x::valz\n")
|
|
a.Equal("valz", rc.StepResults["my-step"].Outputs["x"])
|
|
|
|
handler("::set-output name=x::percent2%25\n")
|
|
a.Equal("percent2%", rc.StepResults["my-step"].Outputs["x"])
|
|
|
|
handler("::set-output name=x::percent2%25%0Atest\n")
|
|
a.Equal("percent2%\ntest", rc.StepResults["my-step"].Outputs["x"])
|
|
|
|
handler("::set-output name=x::percent2%25%0Atest another3%25test\n")
|
|
a.Equal("percent2%\ntest another3%test", rc.StepResults["my-step"].Outputs["x"])
|
|
|
|
handler("::set-output name=x%3A::percent2%25%0Atest\n")
|
|
a.Equal("percent2%\ntest", rc.StepResults["my-step"].Outputs["x:"])
|
|
|
|
handler("::set-output name=x%3A%2C%0A%25%0D%3A::percent2%25%0Atest\n")
|
|
a.Equal("percent2%\ntest", rc.StepResults["my-step"].Outputs["x:,\n%\r:"])
|
|
}
|
|
|
|
func TestAddpath(t *testing.T) {
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
handler("::add-path::/zoo\n")
|
|
a.Equal("/zoo", rc.ExtraPath[0])
|
|
|
|
handler("::add-path::/boo\n")
|
|
a.Equal("/boo", rc.ExtraPath[0])
|
|
}
|
|
|
|
func TestStopCommands(t *testing.T) {
|
|
logger, hook := test.NewNullLogger()
|
|
|
|
a := assert.New(t)
|
|
ctx := common.WithLogger(context.Background(), logger)
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
handler("::set-env name=x::valz\n")
|
|
a.Equal("valz", rc.Env["x"])
|
|
handler("::stop-commands::my-end-token\n")
|
|
handler("::set-env name=x::abcd\n")
|
|
a.Equal("valz", rc.Env["x"])
|
|
handler("::my-end-token::\n")
|
|
handler("::set-env name=x::abcd\n")
|
|
a.Equal("abcd", rc.Env["x"])
|
|
|
|
messages := make([]string, 0)
|
|
for _, entry := range hook.AllEntries() {
|
|
messages = append(messages, entry.Message)
|
|
}
|
|
|
|
a.Contains(messages, "::set-env name=x::abcd\n")
|
|
}
|
|
|
|
func TestAddpathADO(t *testing.T) {
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(ctx)
|
|
|
|
handler("##[add-path]/zoo\n")
|
|
a.Equal("/zoo", rc.ExtraPath[0])
|
|
|
|
handler("##[add-path]/boo\n")
|
|
a.Equal("/boo", rc.ExtraPath[0])
|
|
}
|
|
|
|
func TestAddmask(t *testing.T) {
|
|
logger, hook := test.NewNullLogger()
|
|
|
|
a := assert.New(t)
|
|
ctx := context.Background()
|
|
loggerCtx := common.WithLogger(ctx, logger)
|
|
|
|
rc := new(RunContext)
|
|
handler := rc.commandHandler(loggerCtx)
|
|
handler("::add-mask::my-secret-value\n")
|
|
|
|
a.Equal("***", hook.LastEntry().Message)
|
|
a.NotEqual("*my-secret-value", hook.LastEntry().Message)
|
|
}
|
|
|
|
// based on https://stackoverflow.com/a/10476304
|
|
func captureOutput(t *testing.T, f func()) string {
|
|
old := os.Stdout
|
|
r, w, _ := os.Pipe()
|
|
os.Stdout = w
|
|
|
|
f()
|
|
|
|
outC := make(chan string)
|
|
|
|
go func() {
|
|
var buf bytes.Buffer
|
|
_, err := io.Copy(&buf, r)
|
|
if err != nil {
|
|
a := assert.New(t)
|
|
a.Fail("io.Copy failed")
|
|
}
|
|
outC <- buf.String()
|
|
}()
|
|
|
|
w.Close()
|
|
os.Stdout = old
|
|
out := <-outC
|
|
|
|
return out
|
|
}
|
|
|
|
func TestAddmaskUsemask(t *testing.T) {
|
|
rc := new(RunContext)
|
|
rc.StepResults = make(map[string]*model.StepResult)
|
|
rc.CurrentStep = "my-step"
|
|
rc.StepResults[rc.CurrentStep] = &model.StepResult{
|
|
Outputs: make(map[string]string),
|
|
}
|
|
|
|
a := assert.New(t)
|
|
|
|
config := &Config{
|
|
Secrets: map[string]string{},
|
|
InsecureSecrets: false,
|
|
}
|
|
|
|
re := captureOutput(t, func() {
|
|
ctx := context.Background()
|
|
ctx = WithJobLogger(ctx, "0", "testjob", config, &rc.Masks, map[string]any{})
|
|
|
|
handler := rc.commandHandler(ctx)
|
|
handler("::add-mask::secret\n")
|
|
handler("::set-output:: token=secret\n")
|
|
})
|
|
|
|
a.Equal("[testjob] ***\n[testjob] ::set-output:: = token=***\n", re)
|
|
}
|
|
|
|
func TestSaveState(t *testing.T) {
|
|
rc := &RunContext{
|
|
CurrentStep: "step",
|
|
StepResults: map[string]*model.StepResult{},
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
handler := rc.commandHandler(ctx)
|
|
handler("::save-state name=state-name::state-value\n")
|
|
|
|
assert.Equal(t, "state-value", rc.IntraActionState["step"]["state-name"])
|
|
}
|