[ovs-dev] [PATCH ovn 1/2] tests: Fix bad syntax in "test" for waiting.

Han Zhou zhouhan at gmail.com
Mon Mar 8 22:43:20 UTC 2021


On Fri, Mar 5, 2021 at 1:10 PM Ben Pfaff <blp at ovn.org> wrote:
>
> 'test "$a"' is always true if $abc is nonempty.

I guess you meant: 'test "$abc"' is ... :)

Acked-by: Han Zhou <hzhou at ovn.org>

> Spaces are necessary to test for equality, e.g. 'test $a = $b'.
>
> Signed-off-by: Ben Pfaff <blp at ovn.org>
> ---
>  tests/ovn-controller.at | 4 ++--
>  tests/ovn.at            | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
> index 2cd3e261f2eb..300872aa1852 100644
> --- a/tests/ovn-controller.at
> +++ b/tests/ovn-controller.at
> @@ -165,11 +165,11 @@ OVS_WAIT_UNTIL([check_datapath_type foo])
>  # Change the br-int's datapath type to bar.
>  # It should be reset to foo since ovn-bridge-datapath-type is configured.
>  ovs-vsctl set Bridge br-int datapath-type=bar
> -OVS_WAIT_UNTIL([test foo=`ovs-vsctl get Bridge br-int datapath-type`])
> +OVS_WAIT_UNTIL([test foo = `ovs-vsctl get Bridge br-int datapath-type`])
>  OVS_WAIT_UNTIL([check_datapath_type foo])
>
>  ovs-vsctl set Open_vSwitch . external_ids:ovn-bridge-datapath-type=foobar
> -OVS_WAIT_UNTIL([test foobar=`ovs-vsctl get Bridge br-int datapath-type`])
> +OVS_WAIT_UNTIL([test foobar = `ovs-vsctl get Bridge br-int
datapath-type`])
>  OVS_WAIT_UNTIL([check_datapath_type foobar])
>
>  expected_iface_types=$(ovs-vsctl get Open_vSwitch . iface_types | tr -d
'[[]] ""')
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 39edb6b85526..87579e59d7a5 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -11084,7 +11084,7 @@
sent_garp="ffffffffffff0000010102038100000208060001080006040001000001010203c0a80
>
>  OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [foo1.expout])
>  # Wait until we receive atleast 1 packet
> -OVS_WAIT_UNTIL([test 1=`$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in"
hv2/br-ex_n2-tx.pcap | wc -l`])
> +OVS_WAIT_UNTIL([test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in"
hv2/br-ex_n2-tx.pcap | wc -l`])
>  $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/br-ex_n2-tx.pcap | head
-1 > packets
>  echo $sent_garp > expout
>  AT_CHECK([cat packets], [0], [expout])
> --
> 2.29.2
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev


More information about the dev mailing list