[ovs-dev] [PATCH ovn v2 1/2] northd: Amend ovn-northd pause resume test

Frode Nordahl frode.nordahl at canonical.com
Fri Nov 22 07:47:50 UTC 2019


The current pause and resume tests rely on that ``ovn-northd``
will hold on to the lock while paused.  Update the test to
pause both ``ovn-northd`` instances so we may change this
behaviour.

Replace references to ``ovs-appctl`` with ``ovn-appctl``.

Signed-off-by: Frode Nordahl <frode.nordahl at canonical.com>
---
 tests/ovn-northd.at | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index c73fd9003..1c94f2f65 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -912,7 +912,9 @@ AT_SETUP([ovn -- ovn-northd pause and resume])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 ovn_start
 
-AT_CHECK([test xfalse = x`as northd ovs-appctl -t ovn-northd is-paused`])
+AT_CHECK([test xfalse = x`as northd ovn-appctl -t ovn-northd is-paused`])
+AT_CHECK([test xfalse = x`as northd-backup ovn-appctl -t ovn-northd \
+is-paused`])
 
 ovn-nbctl ls-add sw0
 
@@ -927,7 +929,9 @@ OVS_WAIT_UNTIL([
 
 # Now pause the ovn-northd
 as northd ovs-appctl -t ovn-northd pause
-AT_CHECK([test xtrue = x`as northd ovs-appctl -t ovn-northd is-paused`])
+as northd-backup ovs-appctl -t ovn-northd pause
+AT_CHECK([test xtrue = x`as northd ovn-appctl -t ovn-northd is-paused`])
+AT_CHECK([test xtrue = x`as northd-backup ovn-appctl -t ovn-northd is-paused`])
 
 ovn-nbctl ls-add sw0
 
@@ -938,7 +942,10 @@ OVS_WAIT_UNTIL([
 
 # Now resume ovn-northd
 as northd ovs-appctl -t ovn-northd resume
-AT_CHECK([test xfalse = x`as northd ovs-appctl -t ovn-northd is-paused`])
+as northd-backup ovs-appctl -t ovn-northd resume
+AT_CHECK([test xfalse = x`as northd ovn-appctl -t ovn-northd is-paused`])
+AT_CHECK([test xfalse = x`as northd-backup ovn-appctl -t ovn-northd \
+is-paused`])
 
 OVS_WAIT_UNTIL([
     ovn-sbctl lflow-list sw0
-- 
2.24.0



More information about the dev mailing list