Acked-by: Daniele Di Proietto <diproiet...@vmware.com> On 12/08/2015 22:01, "Joe Stringer" <joestrin...@nicira.com> wrote:
>Rather than saving all of the ping output to a file then checking at the >end, check each ping and fail as soon as there is a connectivity >failure. > >Signed-off-by: Joe Stringer <joestrin...@nicira.com> >--- > tests/system-common-macros.at | 6 ++++++ > tests/system-traffic.at | 44 >++++++++++++++++++++----------------------- > 2 files changed, 26 insertions(+), 24 deletions(-) > >diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at >index 198592c..0e82a91 100644 >--- a/tests/system-common-macros.at >+++ b/tests/system-common-macros.at >@@ -69,3 +69,9 @@ m4_define([ADD_VLAN], > NS_CHECK_EXEC([$2], [ip addr add dev $1.$3 $4]) > ] > ) >+ >+# FORMAT_PING([]) >+# >+# Strip variant pieces from ping output so the output can be reliably >compared. >+# >+m4_define([FORMAT_PING], [grep "transmitted" | sed 's/time.*ms$/time >0ms/']) >diff --git a/tests/system-traffic.at b/tests/system-traffic.at >index 1ff2286..8324480 100644 >--- a/tests/system-traffic.at >+++ b/tests/system-traffic.at >@@ -9,14 +9,13 @@ ADD_NAMESPACES(at_ns0, at_ns1) > ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") > ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24") > >-AT_CAPTURE_FILE([ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.1.1.2 > >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.1.1.2 >> >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.2 >> >ping.output]) >- >-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time >0ms/'], [0], [dnl >+NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.1.1.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.1.1.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms > ]) > >@@ -35,14 +34,13 @@ ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24") > ADD_VLAN(p0, at_ns0, 100, "10.2.2.1/24") > ADD_VLAN(p1, at_ns1, 100, "10.2.2.2/24") > >-AT_CAPTURE_FILE([ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.2.2.2 > >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 >> >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.2.2.2 >> >ping.output]) >- >-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time >0ms/'], [0], [dnl >+NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.2.2.2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms > ]) > >@@ -62,14 +60,13 @@ dnl Without this sleep, we get occasional failures >due to the following error: > dnl "connect: Cannot assign requested address" > sleep 2; > >-AT_CAPTURE_FILE([ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::2 > >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 3 -i 0.3 -w 2 fc00::2 >> >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00::2 >> >ping.output]) >- >-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time >0ms/'], [0], [dnl >+NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 3 -i 0.3 -w 2 fc00::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms > ]) > >@@ -92,14 +89,13 @@ dnl Without this sleep, we get occasional failures >due to the following error: > dnl "connect: Cannot assign requested address" > sleep 2; > >-AT_CAPTURE_FILE([ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00:1::2 > >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 3 -i 0.3 -w 2 fc00:1::2 >> >ping.output]) >-NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00:1::2 >> >ping.output]) >- >-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time >0ms/'], [0], [dnl >+NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00:1::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 3 -i 0.3 -w 2 fc00:1::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms >+]) >+NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00:1::2 | >FORMAT_PING], [0], [dnl > 3 packets transmitted, 3 received, 0% packet loss, time 0ms > ]) > >-- >2.1.4 > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
