On 5/21/21 1:32 AM, Ben Pfaff wrote: > The "(northbound|southbound) database reconnection" tests had > dp-groups=yes variants but they were unconditionally skipped at runtime. > There's no point in having them, so this commit drops them. > > This changes the changes of the tests without datapath groups to have > "dp-groups=no" in their names. That seems like an OK change to me, > but it can easily be reverted if people don't like it. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > tests/ovn-macros.at | 26 ++++++++++++-------------- > tests/ovn-northd.at | 12 ++---------- > 2 files changed, 14 insertions(+), 24 deletions(-) > > diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at > index 2217131ab234..cd02b6986cc2 100644 > --- a/tests/ovn-macros.at > +++ b/tests/ovn-macros.at > @@ -546,17 +546,15 @@ OVS_END_SHELL_HELPERS > > m4_define([OVN_POPULATE_ARP], [AT_CHECK(ovn_populate_arp__, [0], [ignore])]) > > -m4_define([OVN_FOR_EACH_NORTHD], [dnl > -m4_pushdef([NORTHD_TYPE], [ovn-northd])dnl > -m4_pushdef([NORTHD_USE_DP_GROUPS], [yes])dnl > -$1 > -m4_popdef([NORTHD_USE_DP_GROUPS])dnl > -$1 > -m4_popdef([NORTHD_TYPE])dnl > -m4_pushdef([NORTHD_TYPE], [ovn-northd-ddlog])dnl > -m4_pushdef([NORTHD_USE_DP_GROUPS], [yes])dnl > -$1 > -m4_popdef([NORTHD_USE_DP_GROUPS])dnl > -$1 > -m4_popdef([NORTHD_TYPE])dnl > -]) > +# Defines a versions of a test with all combinations of northd and > +# datapath groups. > +m4_define([OVN_FOR_EACH_NORTHD], > + [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog], > + [m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no], [$1 > +])])])
This makes way more sense than what I initially tried to do, thanks for fixing it! > + > +# Some tests aren't prepared for dp groups to be enabled. > +m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS], > + [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog], > + [m4_foreach([NORTHD_USE_DP_GROUPS], [no], [$1 > +])])]) > diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at > index 28a46702cf48..cf7e8a0604ed 100644 > --- a/tests/ovn-northd.at > +++ b/tests/ovn-northd.at > @@ -734,13 +734,9 @@ wait_row_count Datapath_Binding 2 > AT_CLEANUP > ]) > > -OVN_FOR_EACH_NORTHD([ > +OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS([ > AT_SETUP([ovn -- northbound database reconnection]) > > -dnl This test doesn't take into account flows that are shared between > -dnl datapaths when datapath groups are enabled. > -AT_SKIP_IF([test NORTHD_USE_DP_GROUPS = yes]) > - > ovn_start --backup-northd=none > > # Check that ovn-northd is active, by verifying that it creates and > @@ -774,13 +770,9 @@ wait_row_count Logical_Flow $(expr 2 \* $lf) > AT_CLEANUP > ]) > > -OVN_FOR_EACH_NORTHD([ > +OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS([ > AT_SETUP([ovn -- southbound database reconnection]) > > -dnl This test doesn't take into account flows that are shared between > -dnl datapaths when datapath groups are enabled. > -AT_SKIP_IF([test NORTHD_USE_DP_GROUPS = yes]) > - > ovn_start --backup-northd=none > > # Check that ovn-northd is active, by verifying that it creates and > Acked-by: Dumitru Ceara <[email protected]> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
