[ovs-dev] [PATCH] tests: Fix up "ofproto-dpif - ofproto-dpif-monitor 1".

Justin Pettit jpettit at nicira.com
Mon Apr 28 22:57:24 UTC 2014


Acked-by: Justin Pettit <jpettit at nicira.com>



On April 28, 2014 at 3:45:26 PM, Ben Pfaff (blp at nicira.com) wrote:
> Commit 1335a8d578b03e (tests: Fix race condition waiting for monitor
> thread.) fixed a race condition in a test. Commit 8ba0a5227f6 (ovs-thread:
> Make caller provide thread name when creating a thread.) slightly changed
> the output that the test checked, breaking the test. However, I was used
> to the test occasionally failing due to the race (not realizing that the
> race had been fixed) so I applied the commit anyway.
> 
> This commit fixes the broken test.
> 
> Signed-off-by: Ben Pfaff 
> ---
> tests/ofproto-dpif.at | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> index a1442f9..a32bc41 100644
> --- a/tests/ofproto-dpif.at
> +++ b/tests/ofproto-dpif.at
> @@ -4516,12 +4516,12 @@ OVS_WAIT_UNTIL([grep "monitor thread created" ovs-vswitchd.log]) 
> # disable bfd on p0.
> AT_CHECK([ovs-vsctl set interface p0 bfd:enable=false])
> # check log, there should not be the log of thread terminated.
> -AT_CHECK([sed -n "s/^.*|ofproto_dpif_monitor(monitor)|INFO|\(.* terminated\)$/\1/p" 
> ovs-vswitchd.log], [0], [dnl
> +AT_CHECK([sed -n "s/^.*|ofproto_dpif_monitor(monitor[[0-9]]*)|INFO|\(.* terminated\)$/\1/p" 
> ovs-vswitchd.log], [0], [dnl
> ])
> # reenable bfd on p0.
> AT_CHECK([ovs-vsctl set interface p0 bfd:enable=true])
> # check log, should still be on log of thread created.
> -AT_CHECK([sed -n "s/^.*|ofproto_dpif_monitor(monitor)|INFO|\(.* created\)$/\1/p" 
> ovs-vswitchd.log], [0], [dnl
> +AT_CHECK([sed -n "s/^.*|ofproto_dpif_monitor(monitor[[0-9]]*)|INFO|\(.* created\)$/\1/p" 
> ovs-vswitchd.log], [0], [dnl
> monitor thread created
> ])
> # disable bfd and cfm together.
> --
> 1.7.10.4
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
> 




More information about the dev mailing list