On 11/6/20 4:36 AM, Ben Pfaff wrote: > Many of these could be replaced by "ovn-nbctl sync". Some weren't > really needed at all because they were adjacent to something that itself > called sync or otherwise used --wait. Some were more appropriately > done with explicit waits for what was really needed. > > I left some "sleep"s. Some were because they were "negative" sleeps: > they were giving time for something to happen that should *not* happen > (in other words, if you wait for it to happen, you'll wait forever, > unless there's a bug). Some were because I didn't know how to properly > wait for what they were waiting for, or because I didn't understand > the circumstances deeply enough. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > tests/ovn-northd.at | 7 ++ > tests/ovn.at | 167 ++++++++++++-------------------------------- > 2 files changed, 52 insertions(+), 122 deletions(-) > > diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at > index 949a8eee054e..5d670233561e 100644 > --- a/tests/ovn-northd.at > +++ b/tests/ovn-northd.at > @@ -1120,6 +1120,7 @@ ovn-nbctl --wait=sb -- --id=@hc create \ > Load_Balancer_Health_Check vip="10.0.0.10\:80" -- add Load_Balancer . \ > health_check @hc > wait_row_count Service_Monitor 2 > +check ovn-nbctl --wait=hv sync
This should be "--wait=sb". ovn-controller is not started for tests in ovn-northd.at and "--wait=hv" would return immediately. This applies to all "ovn-nbctl --wait=hv sync" in ovn-northd.at. Thanks, Dumitru _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
