Acked-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com>
-----Mesaj original----- De la: dev [mailto:dev-boun...@openvswitch.org] În numele Gurucharan Shetty Trimis: Friday, June 19, 2015 12:18 AM Către: dev@openvswitch.org Cc: Gurucharan Shetty Subiect: [ovs-dev] [PATCH v2 2/2] tests: Adjust output of vconn for windows. Recent tests added for openflow atomic bundle support looks for Linux specific output in logs. Adjust them so that tests pass in Windows too. Signed-off-by: Gurucharan Shetty <gshe...@nicira.com> --- tests/ofproto-macros.at | 9 ++++++++- tests/ofproto.at | 4 ++-- tests/ovs-ofctl.at | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 83b2480..74b02b7 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -16,7 +16,7 @@ s/ hard_age=[0-9]*,// } # Filter (multiline) vconn debug messages from ovs-vswitchd.log. -# Use with ofctl_strip() +# Use with vconn_windows_sub() and ofctl_strip() print_vconn_debug () { awk -F\| < ovs-vswitchd.log ' BEGIN { prt=0 } /\|vconn\|DBG\|/ { sub(/[ \t]*$/, ""); print $3 "|" $4 "|" $5; prt=1; next } @@ -25,6 +25,13 @@ prt==1 { sub(/[ \t]*$/, ""); print $0 } ' } +vconn_windows_sub() { + sed ' +s/tcp:127.0.0.1:[0-9][0-9]*:/unix:/ +s/No error/Success/ +' +} + # parse_listening_port [SERVER] # # Parses the TCP or SSL port on which a server is listening from the diff --git a/tests/ofproto.at b/tests/ofproto.at index f3da397..08585d1 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -3510,8 +3510,8 @@ NXST_FLOW reply: dnl Check logs for OpenFlow trace # Prevent race. -OVS_WAIT_UNTIL([test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" ovs-vswitchd.log | wc -l` -ge 3]) -AT_CHECK([print_vconn_debug | ofctl_strip], [0], [dnl +OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_windows_sub | test `grep +-- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) +AT_CHECK([print_vconn_debug | vconn_windows_sub | ofctl_strip], [0], +[dnl vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO: diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 6c48569..f20f2da 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -2834,9 +2834,9 @@ AT_CHECK([ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLO dnl Check logs for OpenFlow trace # Prevent race. -OVS_WAIT_UNTIL([test `grep -- "|vconn|DBG|unix: sent (Success): OFPST_FLOW reply" ovs-vswitchd.log | wc -l` -ge 2]) +OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_windows_sub | test `grep +-- "|vconn|DBG|unix: sent (Success): OFPST_FLOW reply" | wc -l` -ge 2]) # AT_CHECK([sed -n "s/^.*\(|vconn|DBG|.*xid=.*:\).*$/\1/p" ovs-vswitchd.log], [0], [dnl -AT_CHECK([print_vconn_debug | ofctl_strip], [0], [dnl +AT_CHECK([print_vconn_debug | vconn_windows_sub | ofctl_strip], [0], +[dnl vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): -- 1.7.9.5 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
