Skip to content

Commit

Permalink
tests: Fix conntrack not being flushed between tests.
Browse files Browse the repository at this point in the history
Since the split, the conntrack is no longer flushed between system
tests.  This may cause some random failures if residual conntrack
entries interfere with the next test in some way.  The command doesn't
exist in the OVN's ovstest.  The one from OVS should be used instead:

  ovstest: unknown command 'test-netlink-conntrack'; use --help for help

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit f12c8a2)
  • Loading branch information
igsilya authored and dceara committed Feb 20, 2025
1 parent 9d6e4c1 commit c33b46b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ MULTINODE_TESTSUITE_RESULTS = $(MULTINODE_TESTSUITE_DIR)/results
AUTOTEST_PATH = $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-vtep:northd:utilities:controller:ic

export ovs_srcdir
export ovs_builddir

check-local:
set $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH); \
Expand Down
2 changes: 1 addition & 1 deletion tests/system-kmod-macros.at
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ m4_define([CHECK_CONNTRACK],
on_exit 'modprobe -r mod'
])
sysctl -w net.netfilter.nf_conntrack_helper=0
on_exit 'ovstest test-netlink-conntrack flush'
on_exit "${ovs_builddir}/tests/ovstest test-netlink-conntrack flush"
)

# CHECK_CONNTRACK_ALG()
Expand Down

0 comments on commit c33b46b

Please # to comment.