From 84c45de446b69f83df919a91bc684da910824d6f Mon Sep 17 00:00:00 2001 From: Stefan Kobza Date: Sat, 13 Feb 2016 00:25:23 +0100 Subject: Remove multiprocessing from PacketVerifier, tune tests. Change-Id: I37b171c50bad97255a42d6f9426f749055357380 Signed-off-by: Stefan Kobza --- resources/traffic_scripts/ipv4_sweep_ping.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'resources/traffic_scripts/ipv4_sweep_ping.py') diff --git a/resources/traffic_scripts/ipv4_sweep_ping.py b/resources/traffic_scripts/ipv4_sweep_ping.py index 4b82a9b03e..5005345250 100755 --- a/resources/traffic_scripts/ipv4_sweep_ping.py +++ b/resources/traffic_scripts/ipv4_sweep_ping.py @@ -64,12 +64,10 @@ def main(): ether = rxq.recv(ignore=sent_packets) if ether is None: - rxq._proc.terminate() raise RuntimeError( 'ICMP echo reply seq {0} Rx timeout'.format(echo_seq)) if not ether.haslayer(IP): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no IPv4 received {0}'.format( ether.__repr__())) @@ -77,7 +75,6 @@ def main(): ipv4 = ether['IP'] if not ipv4.haslayer(ICMP): - rxq._proc.terminate() raise RuntimeError( 'Unexpected packet with no ICMP received {0}'.format( ipv4.__repr__())) @@ -85,7 +82,6 @@ def main(): icmpv4 = ipv4['ICMP'] if icmpv4.id != echo_id or icmpv4.seq != echo_seq: - rxq._proc.terminate() raise RuntimeError( 'Invalid ICMP echo reply received ID {0} seq {1} should be ' + 'ID {2} seq {3}, {0}'.format(icmpv4.id, icmpv4.seq, echo_id, @@ -95,17 +91,14 @@ def main(): del icmpv4.chksum tmp = ICMP(str(icmpv4)) if tmp.chksum != chksum: - rxq._proc.terminate() raise RuntimeError( 'Invalid checksum {0} should be {1}'.format(chksum, tmp.chksum)) recv_payload_len = ipv4.len - 20 - 8 load = tmp['Raw'].load[0:recv_payload_len] if load != data[0:echo_seq]: - rxq._proc.terminate() raise RuntimeError( 'Received ICMP payload does not match sent payload') - rxq._proc.terminate() sys.exit(0) if __name__ == "__main__": -- cgit 1.2.3-korg