Skip to content

Commit 056aa2c

Browse files
committed
gofmt
1 parent 9acb2ea commit 056aa2c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

daemon/cmd/integration_runner/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func main() {
344344

345345
ctx = integration.NewContext(*flagPHP, *flagCGI)
346346
ctx.Valgrind = *flagValgrind
347-
if (ctx.Valgrind != "" && *flagWorkers != 1) {
347+
if ctx.Valgrind != "" && *flagWorkers != 1 {
348348
fmt.Fprintf(os.Stderr, "cannot run valgrind on multiple workers\n")
349349
os.Exit(1)
350350
}

daemon/internal/newrelic/integration/valgrind.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,10 @@ func (tx *ValgrindCGI) Execute() (http.Header, []byte, error) {
148148

149149
// Replace the handler with valgrind
150150
tx.handler.Path = cmd.Path
151-
tx.handler.Args = cmd.Args[1:] // The first Arg is the Path.
152-
// ServeHTTP will re-add Path
153-
// to the front of Args
151+
// The first Arg is the Path.
152+
// ServeHTTP will re-add Path
153+
// to the front of Args
154+
tx.handler.Args = cmd.Args[1:]
154155

155156
ch := make(chan resultOrError, 1)
156157
go func() {
@@ -182,7 +183,6 @@ func (tx *ValgrindCGI) Execute() (http.Header, []byte, error) {
182183
output = append(output, data...)
183184
}
184185

185-
186186
// Ensure a non-nil error is returned when valgrind detects errors.
187187
// Otherwise, the test could be marked as passing if it does not have
188188
// any expectations on the test output. This sucks.
@@ -197,6 +197,7 @@ func (tx *ValgrindCGI) Execute() (http.Header, []byte, error) {
197197
return resp.HeaderMap, output, err
198198

199199
}
200+
200201
// resultOrError is a poor man's sum type.
201202
type resultOrError struct {
202203
R *valgrind.Report

0 commit comments

Comments
 (0)