From 0e0bc35879982ace060bd7d32f91732bfaf990a9 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Wed, 17 Feb 2021 13:15:14 -0800 Subject: Clean up test style - Wrap comments at 80 columns - Avoid duplicating the number of retries (5) - Reduce indentation - Use (*testing.T).Fatal rather than (*testing.T).Fatalf PiperOrigin-RevId: 358017412 --- test/packetimpact/tests/tcp_synrcvd_reset_test.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/packetimpact/tests/tcp_synrcvd_reset_test.go b/test/packetimpact/tests/tcp_synrcvd_reset_test.go index 4ab9509ec..32271d7b2 100644 --- a/test/packetimpact/tests/tcp_synrcvd_reset_test.go +++ b/test/packetimpact/tests/tcp_synrcvd_reset_test.go @@ -45,19 +45,16 @@ func TestTCPSynRcvdReset(t *testing.T) { // Expect the connection to have transitioned SYN-RCVD to CLOSED. // - // Retransmit the ACK a few times to give time for the DUT to - // transition to CLOSED. We cannot use TCP_INFO to lookup the state - // as this is a passive DUT connection. - i := 0 - for ; i < 5; i++ { + // Retransmit the ACK a few times to give time for the DUT to transition to + // CLOSED. We cannot use TCP_INFO to lookup the state as this is a passive + // DUT connection. + for i := 0; i < 5; i++ { conn.Send(t, testbench.TCP{Flags: testbench.Uint8(header.TCPFlagAck)}) if _, err := conn.ExpectData(t, &testbench.TCP{Flags: testbench.Uint8(header.TCPFlagRst)}, nil, time.Second); err != nil { t.Logf("retransmit%d ACK as we did not get the expected RST, %s", i, err) - } else { - break + continue } + return } - if i == 5 { - t.Fatalf("expected a TCP RST") - } + t.Fatal("did not receive a TCP RST") } -- cgit v1.2.3