Some tests (e.g., the ones in ovn-controller-vtep.at) were completely missed when the macro was added. Some other slipped in from in-flight patches.
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2025-December/428375.html Reported-by: Xavier Simonart <[email protected]> Signed-off-by: Dumitru Ceara <[email protected]> --- tests/ovn-controller-vtep.at | 7 +++++++ tests/ovn-northd.at | 2 ++ tests/ovn.at | 17 +++++++++++++++++ tests/perf-northd.at | 4 ++++ tests/system-ovn.at | 9 +-------- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index d410ecd284..96e93d1ba2 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -162,6 +162,7 @@ AT_CHECK([ovn-sbctl --columns=vtep_logical_switches list Chassis | cut -d ':' -f ]) OVN_CONTROLLER_VTEP_STOP([/Chassis for VTEP physical switch (br-vtep) disappears/d]) +OVN_CLEANUP_NORTHD AT_CLEANUP @@ -237,6 +238,7 @@ AT_CHECK_UNQUOTED([ovn-sbctl --columns=chassis list Port_Binding | cut -d ':' -f ]) OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical port/d]) +OVN_CLEANUP_NORTHD AT_CLEANUP @@ -279,6 +281,7 @@ ${chassis_uuid} ]) OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical datapath/d]) +OVN_CLEANUP_NORTHD AT_CLEANUP @@ -333,6 +336,7 @@ AT_CHECK([vtep-ctl --columns=tunnel_key list Logical_Switch | cut -d ':' -f2 | t ]) OVN_CONTROLLER_VTEP_STOP +OVN_CLEANUP_NORTHD AT_CLEANUP @@ -437,6 +441,7 @@ AT_CHECK([vtep-ctl --columns=MAC list Ucast_Macs_Remote | cut -d ':' -f2- | tr - ]) OVN_CONTROLLER_VTEP_STOP +OVN_CLEANUP_NORTHD AT_CLEANUP @@ -507,6 +512,7 @@ AT_CHECK([vtep-ctl --columns=MAC list Ucast_Macs_Remote | cut -d ':' -f2- | tr - ]) OVN_CONTROLLER_VTEP_STOP([/has already been known to be on logical port/d]) +OVN_CLEANUP_NORTHD AT_CLEANUP # Tests vtep module 'Mcast_Macs_Remote's. @@ -565,6 +571,7 @@ done | sort], [0], [dnl ]) OVN_CONTROLLER_VTEP_STOP +OVN_CLEANUP_NORTHD AT_CLEANUP diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 09fbcebbce..0a333a017b 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -3084,6 +3084,7 @@ check ovn-nbctl --wait=sb $cmd check_row_count nb:Logical_Router 2048 wait_row_count sb:Datapath_Binding 4096 +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -18883,6 +18884,7 @@ AT_CHECK([ovn-sbctl lflow-list ls1 | grep ls_in_apply_port_sec | ovn_strip_lflow table=??(ls_in_apply_port_sec), priority=50 , match=(reg0[[15]] == 1), action=(drop;) ]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) diff --git a/tests/ovn.at b/tests/ovn.at index 66cd897e42..3c4258867e 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3182,6 +3182,7 @@ AT_CHECK_UNQUOTED([ovn-appctl -t ovn-trace trace --all lsw100 "inport == p100 && unknown datapath "lsw100" ]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -10379,6 +10380,7 @@ AT_CHECK([ovn-nbctl --wait=sb set logical_switch_port local1 tag_request=50]) AT_CHECK([ovn-nbctl lsp-get-tag local1], [0], [50 ]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -19562,6 +19564,7 @@ dnl Check if updated address got propagated to the port group address sets check_column '10.0.0.11 10.0.0.2' Address_Set addresses name=pg1_ip4 check_column '2001:db8::11 2001:db8::2' Address_Set addresses name=pg1_ip6 +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -19628,6 +19631,7 @@ AT_CHECK( [["2001:db8:2::ff:fe00:2", "2001:db8:3::ff:fe00:3"]] ]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -21845,6 +21849,7 @@ AT_CHECK([ovn-nbctl lsp-set-addresses sw2-p1 "00:00:00:00:00:04 192.168.0.2"]) AT_CHECK([ovn-nbctl lsp-set-addresses sw2-p1 "00:00:00:00:00:04 192.168.0.3"]) AT_CHECK([ovn-nbctl lsp-set-addresses sw2-p1 "00:00:00:00:00:04 aef0::1"]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -22595,6 +22600,8 @@ ovn-nbctl get Logical-Switch-Port p0 dynamic_addresses AT_CHECK([ovn-nbctl get Logical-Switch-Port p0 dynamic_addresses], [0], [[[]] ]) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -22618,6 +22625,7 @@ done ovn-nbctl list logical_switch_port ovn-nbctl list logical_router_port +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -23571,6 +23579,7 @@ AT_CHECK([ovn-nbctl ls-add sw1], [1], [ignore], [ovn-nbctl: transaction error: {"details":"insert operation not allowed when database server is in read only mode","error":"not allowed"} ]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -25200,6 +25209,7 @@ on_exit 'kill $(cat ovn-nbctl.pid)' # but we can still ensure that the command is successful. AT_CHECK([ovn-nbctl -u $sockfile show]) +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -29347,6 +29357,8 @@ check ovn-nbctl lr-add r1 check ovn-nbctl lrp-add r1 rp1 CC:DD:EE:EE:DD:CC AEF0::1/64 BEF0::1/64 AT_CHECK([ovn-nbctl --may-exist lrp-add r1 rp1 cc:dd:ee:ee:dd:cc bef0:0000:0000:0000::1/64 aef0::1/64]) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -29360,6 +29372,8 @@ check ovn-nbctl lr-nat-add r1 dnat AEF0::1 BEEF::1 AT_CHECK([ovn-nbctl --may-exist lr-nat-add r1 snat aef0:0000::1 beef:0000::/ffff:ffff:ffff:ffff::0]) AT_CHECK([ovn-nbctl --may-exist lr-nat-add r1 dnat aef0:0000:00::1 beef::0001]) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -29373,6 +29387,8 @@ check ovn-nbctl lr-nat-add r1 dnat AEF0::1 BEEF::1 AT_CHECK([ovn-nbctl --if-exists lr-nat-del r1 snat beef:0000::0/ffff:ffff:ffff:ffff::0]) AT_CHECK([ovn-nbctl --if-exists lr-nat-del r1 dnat aef0:0000:00::1]) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -42728,6 +42744,7 @@ check ovn-nbctl --wait=sb acl-del sw from-lport 1000 1 wait_row_count ACL_ID 0 +OVN_CLEANUP_NORTHD AT_CLEANUP ]) diff --git a/tests/perf-northd.at b/tests/perf-northd.at index 515b88244e..25c5c8ba4e 100644 --- a/tests/perf-northd.at +++ b/tests/perf-northd.at @@ -199,6 +199,8 @@ AT_SETUP([ovn-northd basic scale test -- 200 Hypervisors, 200 Logical Ports/Hype ovn_start BUILD_NBDB(OVN_BASIC_SCALE_CONFIG(200, 200)) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) @@ -207,5 +209,7 @@ AT_SETUP([ovn-northd basic scale test -- 500 Hypervisors, 50 Logical Ports/Hyper ovn_start BUILD_NBDB(OVN_BASIC_SCALE_CONFIG(500, 50)) + +OVN_CLEANUP_NORTHD AT_CLEANUP ]) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 33aaa4cd79..965ee3b84b 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -18678,14 +18678,7 @@ AT_CHECK([ip route del 10.10.4.1 via 20.0.0.25 vrf vrf-$vni]) OVN_CLEANUP_CONTROLLER([hv1], [], [], [lr-frr]) -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) +OVN_CLEANUP_NORTHD as OVS_TRAFFIC_VSWITCHD_STOP(["/.*error receiving.*/d -- 2.51.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
