Skip to content

Commit 3040753

Browse files
EtiennePerotgvisor-bot
authored andcommitted
iperf_test: Better debug logging on failure.
PiperOrigin-RevId: 785491613
1 parent 9ea209f commit 3040753

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

pkg/test/dockerutil/container.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,20 +225,24 @@ func (c *Container) Run(ctx context.Context, r RunOpts, args ...string) (string,
225225
return "", fmt.Errorf("container config: %w", err)
226226
}
227227
if err := c.create(ctx, r.Image, cfg, c.hostConfig(r), nil); err != nil {
228-
return "", err
228+
return "", fmt.Errorf("failed to create container: %w", err)
229229
}
230230

231231
if err := c.Start(ctx); err != nil {
232232
logs, _ := c.Logs(ctx)
233-
return logs, err
233+
return logs, fmt.Errorf("failed to start container: %w", err)
234234
}
235235

236236
if err := c.Wait(ctx); err != nil {
237237
logs, _ := c.Logs(ctx)
238-
return logs, err
238+
return logs, fmt.Errorf("container failed: %w", err)
239239
}
240240

241-
return c.Logs(ctx)
241+
logs, err := c.Logs(ctx)
242+
if err != nil {
243+
return logs, fmt.Errorf("failed to get logs: %w", err)
244+
}
245+
return logs, nil
242246
}
243247

244248
// ConfigsFrom returns container configs from RunOpts and args. The caller should call 'CreateFrom'

test/benchmarks/network/iperf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func BenchmarkIperfManyConnections(b *testing.B) {
215215
Links: []string{server.MakeLink("iperfsrv")},
216216
}, iperf.MakeCmd("iperfsrv", port)...)
217217
if err != nil {
218-
b.Fatalf("failed to run client: %v", err)
218+
b.Fatalf("failed to run client: %v (output: %q)", err, out)
219219
}
220220
b.StopTimer()
221221
iperf.Report(b, out)

0 commit comments

Comments
 (0)