Skip to content

Commit

Permalink
tests: run system tests also with monitor-all=true
Browse files Browse the repository at this point in the history
Before this patch, each system test was supposed to run four times:
- with and without northd-parallelization
- with and without monitor-all
However, while the titles of the test were updated, system tests were never
run with monitor-all=true (i.e. they were run twice w/o monitor-all).

This is now fixed, and the four flavors of the tests are run.

Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
Acked-by: Ales Musil <amusil@redhat.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit 2670889)
  • Loading branch information
simonartxavier authored and dceara committed Jul 25, 2023
1 parent ae89276 commit 2816dd9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/system-kmod-macros.at
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
_OVS_VSWITCHD_START([])
dnl Add bridges, ports, etc.
AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])
if test OVN_MONITOR_ALL = yes; then
ovs-vsctl set open . external_ids:ovn-monitor-all=true
fi
])

# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])
Expand Down
3 changes: 3 additions & 0 deletions tests/system-userspace-macros.at
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
dnl Add bridges, ports, etc.
OVS_WAIT_WHILE([ip link show br0])
AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])
if test OVN_MONITOR_ALL = yes; then
ovs-vsctl set open . external_ids:ovn-monitor-all=true
fi
])

# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])
Expand Down

0 comments on commit 2816dd9

Please sign in to comment.