go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include logs for packetimpact tests that are expected to fail 

PiperOrigin-RevId: 368938936
This commit is contained in:
Zeling Feng 2021-04-16 16:22:09 -07:00 committed by gVisor bot
parent 81ff6bd921
commit 6241f89f49
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/packetimpact/runner/dut.go
View File

@ -369,30 +369,32 @@ func TestWithDUT(ctx context.Context, t *testing.T, mkDevice func(*dockerutil.Co
"--dut_infos_json", string(dutInfosBytes), "--dut_infos_json", string(dutInfosBytes),
) )
testbenchLogs, err := testbenchContainer.Exec(ctx, dockerutil.ExecOpts{}, testArgs...) testbenchLogs, err := testbenchContainer.Exec(ctx, dockerutil.ExecOpts{}, testArgs...)
if (err != nil) != expectFailure { var dutLogs string
var dutLogs string for i, dut := range duts {
for i, dut := range duts { logs, err := dut.Logs(ctx)
logs, err := dut.Logs(ctx) if err != nil {
if err != nil { logs = fmt.Sprintf("failed to fetch DUT logs: %s", err)
logs = fmt.Sprintf("failed to fetch DUT logs: %s", err) }
} dutLogs = fmt.Sprintf(`%s====== Begin of DUT-%d Logs ======
dutLogs = fmt.Sprintf(`%s====== Begin of DUT-%d Logs ======
%s %s
====== End of DUT-%d Logs ====== ====== End of DUT-%d Logs ======
`, dutLogs, i, logs, i) `, dutLogs, i, logs, i)
} }
testLogs := fmt.Sprintf(`
t.Errorf(`test error: %v, expect failure: %t
%s====== Begin of Testbench Logs ====== %s====== Begin of Testbench Logs ======
%s %s
====== End of Testbench Logs ======`, ====== End of Testbench Logs ======`, dutLogs, testbenchLogs)
err, expectFailure, dutLogs, testbenchLogs) if (err != nil) != expectFailure {
t.Errorf(`test error: %v, expect failure: %t
%s`, err, expectFailure, testLogs)
} else if expectFailure {
t.Logf(`test failed as expected: %v
%s`, err, testLogs)
} }
} }