Skip to content

Fix debug logging regression bug affecting Command tests #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FixTestRepeat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix debug logging regression bug affecting Command tests #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resource/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (c *Command) GetExec() string {
}

func (c *Command) Validate(sys *system.System) []TestResult {
ctx := context.WithValue(context.Background(), idKey{}, c.ID())
ctx := context.WithValue(context.Background(), system.CommandIDKey, c.ID())
skip := c.Skip

if c.Timeout == 0 {
Expand Down
11 changes: 10 additions & 1 deletion system/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,17 @@ import (
"os/exec"
"time"


"github.com/goss-org/goss/util"

)

// CommandIDKeyType is the unique key for command IDs in context.
type CommandIDKeyType struct{}

// CommandIDKey is the only instance that must be used everywhere.
var CommandIDKey = CommandIDKeyType{}

type Command interface {
Command() string
Exists() (bool, error)
Expand Down Expand Up @@ -54,7 +62,8 @@ func (c *DefCommand) setup() error {
c.exitStatus = cmd.Status
stdoutB := cmd.Stdout.Bytes()
stderrB := cmd.Stderr.Bytes()
id := c.Ctx.Value("id")

id := c.Ctx.Value(CommandIDKey)
logBytes(stdoutB, fmt.Sprintf("[Command][%s][stdout] ", id))
logBytes(stderrB, fmt.Sprintf("[Command][%s][stderr] ", id))
c.stdout = bytes.NewReader(stdoutB)
Expand Down