The FreeBSD CI builds keep failing because processes of tests are not
properly killed. This leaves the build hanging until it times out, and
ultimately fails.
Changes name of pidfile pid2 to 2.pid so that the
on_exit 'kill `cat *.pid`' will capture all pidfiles.
Fixes pidfile name logic in test that uses OVSDB_SERVER_SHUTDOWN_N, so
that all pidfile names match the form *.pid.
Replaces unnecessary --pidfile="`pwd`"/pid with just --pidfile, because
by default this argument creates a pidfile named <proc-name>.pid.
Removes extra [test ! -e pid || kill `cat pid`] that run upon AT_CHECK
failure, because those processes are killed with on_exit. Also adds
on_exit in tests where it was missing.
Fixes: 561205007e ("tests: Get rid of overly specific --pidfile and --unixctl
options.")
Fixes: 0be15ad76f ("ovsdb-server.at: Add unit test for record/replay.")
Fixes: 7964ffe7d2 ("ovsdb: relay: Add support for transaction forwarding.")
Fixes: e879d33e83 ("ovsdb/jsonrpc-server: ovsdb-server closes accepted
connections immediately.")
Fixes: 7ed9240836 ("ovsdb-client: Move ovsdb-client specific tests to new .at
file.")
Signed-off-by: Rosemarie O'Riorden <[email protected]>
---
- v1 was an outdated work-in-progress
- Fixes OVSDB_SERVER_SHUTDOWN_N, pidfile names, removes unnecessary
process kills.
tests/ovsdb-client.at | 3 ++
tests/ovsdb-server.at | 110 ++++++++++++++++++------------------------
2 files changed, 51 insertions(+), 62 deletions(-)
diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at
index 06b671df8..2d14f1ac2 100644
--- a/tests/ovsdb-client.at
+++ b/tests/ovsdb-client.at
@@ -3,6 +3,7 @@ AT_BANNER([OVSDB -- ovsdb-client commands])
AT_SETUP([ovsdb-client get-schema-version and get-schema-cksum])
AT_KEYWORDS([ovsdb client positive])
ordinal_schema > schema
+on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore])
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket
db], [0], [ignore], [ignore])
AT_CHECK([ovsdb-client get-schema-version unix:socket ordinals], [0], [5.1.3
@@ -14,6 +15,7 @@ AT_CLEANUP
AT_SETUP([ovsdb-client needs-conversion (no conversion needed)])
AT_KEYWORDS([ovsdb client file positive])
+on_exit 'kill `cat *.pid`'
ordinal_schema > schema
touch .db.~lock~
AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore])
@@ -27,6 +29,7 @@ AT_SETUP([ovsdb-client needs-conversion (conversion needed)])
AT_KEYWORDS([ovsdb client file positive])
ordinal_schema > schema
touch .db.~lock~
+on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore])
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket
db], [0], [ignore], [ignore])
sed 's/5\.1\.3/5.1.4/' < schema > schema2
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 499f5c9f8..8d6a14db0 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -4,7 +4,7 @@ m4_define([OVSDB_SERVER_SHUTDOWN],
[OVS_APP_EXIT_AND_WAIT_BY_TARGET([ovsdb-server], [ovsdb-server.pid])])
m4_define([OVSDB_SERVER_SHUTDOWN_N],
- [cp pid$1 savepid$1
+ [cp $1.pid savepid$1
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl$1 -e exit], [0], [ignore], [ignore])
OVS_WAIT_WHILE([kill -0 `cat savepid$1`], [kill `cat savepid$1`])])
@@ -30,14 +30,13 @@ m4_define([OVSDB_CHECK_EXECUTION],
AT_KEYWORDS([ovsdb server positive unix $5])
$2 > schema
AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket
db], [0], [ignore], [ignore])
m4_foreach([txn], [$3],
- [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [stdout],
[ignore],
- [test ! -e pid || kill `cat pid`])
+ [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [stdout],
[ignore])
cat stdout >> output
])
- AT_CHECK([uuidfilt output], [0], [$4], [ignore],
- [test ! -e pid || kill `cat pid`])
+ AT_CHECK([uuidfilt output], [0], [$4], [ignore])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
@@ -88,8 +87,7 @@ AT_CHECK([uuidfilt output], [0],
[[[{"uuid":["uuid","<0>"]}]
[{"uuid":["uuid","<1>"]}]
[{"rows":[{"_uuid":["uuid","<0>"],"_version":["uuid","<2>"],"name":"zero","number":0},{"_uuid":["uuid","<1>"],"_version":["uuid","<3>"],"name":"one","number":1}]}]
-]], [],
- [test ! -e pid || kill `cat pid`])
+]], [])
AT_CLEANUP
AT_SETUP([truncating database log with bad transaction])
@@ -136,8 +134,7 @@ AT_CHECK([uuidfilt output], [0],
[[[{"uuid":["uuid","<0>"]}]
[{"uuid":["uuid","<1>"]}]
[{"rows":[{"_uuid":["uuid","<0>"],"_version":["uuid","<2>"],"name":"zero","number":0},{"_uuid":["uuid","<1>"],"_version":["uuid","<3>"],"name":"one","number":1}]}]
-]], [],
- [test ! -e pid || kill `cat pid`])
+]], [])
AT_CLEANUP
dnl CHECK_DBS([databases])
@@ -159,6 +156,7 @@ ordinal_schema > schema1
constraint_schema > schema2
AT_CHECK([ovsdb-tool create db1 schema1], [0], [ignore], [ignore])
AT_CHECK([ovsdb-tool create db2 schema2], [0], [ignore], [ignore])
+on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:db.sock
db1 db2], [0], [ignore], [ignore])
CHECK_DBS([constraints
ordinals
@@ -166,7 +164,7 @@ ordinals
AT_CHECK(
[[ovstest test-jsonrpc request unix:db.sock get_schema [\"nonexistent\"]]],
[0],
[[{"error":{"details":"get_schema request specifies unknown database
nonexistent","error":"unknown
database","syntax":"[\"nonexistent\"]"},"id":0,"result":null}
-]], [], [test ! -e pid || kill `cat pid`])
+]], [])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP
@@ -393,7 +391,7 @@ AT_CHECK(
"table": "Manager",
"uuid-name": "x",
"row": {"target": "punix:socket2"}}]']], [0], [ignore], [ignore])
-on_exit 'kill `cat ovsdb-server.pid`'
+on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile
--remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file
db], [0], [ignore], [ignore])
ovs-appctl -t ovsdb-server time/warp 6000 1000
AT_CHECK(
@@ -686,6 +684,7 @@ ovsdb_check_online_compaction() {
ovsdb-tool create-cluster db schema unix:s1.raft
fi])
dnl Start ovsdb-server.
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server -vvlog:off -vconsole:off --detach --no-chdir
--pidfile --remote=punix:socket --log-file db], [0])
AT_CHECK([ovsdb_client_wait unix:socket ordinals connected])
AT_CAPTURE_FILE([ovsdb-server.log])
@@ -832,7 +831,7 @@ _uuid name number
<0> five 5
<1> four 4
<2> three 3
-], [], [test ! -e pid || kill `cat pid`])
+], [])
OVSDB_SERVER_SHUTDOWN
}
OVS_END_SHELL_HELPERS
@@ -1319,15 +1318,14 @@ m4_define([OVSDB_CHECK_EXECUTION],
$2 > schema
PKIDIR=$abs_top_builddir/tests
AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile
--private-key=$PKIDIR/testpki-privkey2.pem
--certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem
--remote=pssl:0:127.0.0.1 db], [0], [ignore], [ignore])
PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT])
m4_foreach([txn], [$3],
- [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem
--certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem
transact ssl:127.0.0.1:$SSL_PORT 'txn'], [0], [stdout], [ignore],
- [test ! -e pid || kill `cat pid`])
+ [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem
--certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem
transact ssl:127.0.0.1:$SSL_PORT 'txn'], [0], [stdout], [ignore])
cat stdout >> output
])
- AT_CHECK([uuidfilt output], [0], [$4], [ignore],
- [test ! -e pid || kill `cat pid`])
+ AT_CHECK([uuidfilt output], [0], [$4], [ignore])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
@@ -1356,16 +1354,15 @@ m4_define([OVSDB_CHECK_EXECUTION],
AT_SKIP_IF([test $HAVE_IPV6 = no])
$2 > schema
PKIDIR=$abs_top_builddir/tests
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile
--private-key=$PKIDIR/testpki-privkey2.pem
--certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem
--remote=pssl:0:[[::1]] db], [0], [ignore], [ignore])
PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT])
m4_foreach([txn], [$3],
- [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem
--certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem
transact ssl:[[::1]]:$SSL_PORT 'txn'], [0], [stdout], [ignore],
- [test ! -e pid || kill `cat pid`])
+ [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem
--certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem
transact ssl:[[::1]]:$SSL_PORT 'txn'], [0], [stdout], [ignore])
cat stdout >> output
])
- AT_CHECK([uuidfilt output], [0], [$4], [ignore],
- [test ! -e pid || kill `cat pid`])
+ AT_CHECK([uuidfilt output], [0], [$4], [ignore])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
@@ -1392,16 +1389,15 @@ m4_define([OVSDB_CHECK_EXECUTION],
AT_KEYWORDS([ovsdb server positive tcp $5])
$2 > schema
PKIDIR=$abs_top_builddir/tests
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile
--remote=ptcp:0:127.0.0.1 db], [0], [ignore], [ignore])
PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
m4_foreach([txn], [$3],
- [AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT 'txn'], [0],
[stdout], [ignore],
- [test ! -e pid || kill `cat pid`])
+ [AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT 'txn'], [0],
[stdout], [ignore])
cat stdout >> output
])
- AT_CHECK([uuidfilt output], [0], [$4], [ignore],
- [test ! -e pid || kill `cat pid`])
+ AT_CHECK([uuidfilt output], [0], [$4], [ignore])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
@@ -1429,16 +1425,15 @@ m4_define([OVSDB_CHECK_EXECUTION],
AT_SKIP_IF([test $HAVE_IPV6 = no])
$2 > schema
PKIDIR=$abs_top_builddir/tests
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile
--remote=ptcp:0:[[::1]] db], [0], [ignore], [ignore])
PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
m4_foreach([txn], [$3],
- [AT_CHECK([ovsdb-client transact tcp:[[::1]]:$TCP_PORT 'txn'], [0],
[stdout], [ignore],
- [test ! -e pid || kill `cat pid`])
+ [AT_CHECK([ovsdb-client transact tcp:[[::1]]:$TCP_PORT 'txn'], [0],
[stdout], [ignore])
cat stdout >> output
])
- AT_CHECK([uuidfilt output], [0], [$4], [ignore],
- [test ! -e pid || kill `cat pid`])
+ AT_CHECK([uuidfilt output], [0], [$4], [ignore])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
@@ -1520,13 +1515,13 @@ m4_define([OVSDB_CHECK_EXECUTION_RELAY],
target=4
$3 > schema
schema_name=`ovsdb-tool schema-name schema`
+ on_exit 'kill `cat *.pid`'
AT_CHECK([if test $1 = standalone; then
ovsdb-tool create db1 schema
else
ovsdb-tool create-cluster db1 schema unix:s1.raft
fi], [0], [stdout], [ignore])
- on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log dnl
--pidfile --remote=punix:db1.sock db1
], [0], [ignore], [ignore])
@@ -1600,12 +1595,11 @@ m4_define([OVSDB_CHECK_EXECUTION],
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore])
i
- on_exit 'test ! -e pid || kill `cat pid`'
- AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
- on_exit 'test ! -e pid2 || kill `cat pid2`'
+ AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
m4_foreach([txn], [$3],
[AT_CHECK([ovsdb-client transact 'txn'], [0], [stdout], [ignore])
@@ -1646,11 +1640,10 @@ m4_define([OVSDB_CHECK_REPLICATION],
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
+ on_exit 'kill `cat *.pid`'
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore])
- on_exit 'test ! -e pid || kill `cat pid`'
- AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock --sync-exclude-tables=mydb:b db2], [0], [ignore],
[ignore])
- on_exit 'test ! -e pid2 || kill `cat pid2`'
+ AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock --sync-exclude-tables=mydb:b db2], [0], [ignore],
[ignore])
m4_foreach([txn], [$3],
[AT_CHECK([ ovsdb-client transact 'txn' ], [0], [stdout], [ignore])
@@ -1718,6 +1711,7 @@ AT_CLEANUP
#ovsdb-server/set-sync-exclude-tables command
AT_SETUP([ovsdb-server/set-sync-exclude-tables])
+on_exit 'kill `cat *.pid`'
AT_KEYWORDS([ovsdb server replication set-exclude-tables])
AT_SKIP_IF([test $DIFF_SUPPORTS_NORMAL_FORMAT = no])
@@ -1726,12 +1720,10 @@ AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout],
[ignore])
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
-on_exit 'test ! -e pid2 || kill `cat pid2`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
-AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-sync-exclude-tables
mydb:b], [0], [ignore], [ignore], [test ! -e pid || kill `cat pid`; test ! -e
pid2 || kill `cat pid2`])
+AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-sync-exclude-tables
mydb:b], [0], [ignore], [ignore])
AT_CHECK([ovsdb-client transact unix:db.sock \
'[["mydb",
@@ -1740,11 +1732,9 @@ AT_CHECK([ovsdb-client transact unix:db.sock \
"row": {"number": 0, "name": "zero"}},
{"op": "insert",
"table": "b",
- "row": {"number": 1, "name": "one"}}]]'], [0], [stdout], [ignore],
- [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
+ "row": {"number": 1, "name": "one"}}]]'], [0], [stdout], [ignore])
-AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout], [ignore],
- [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
+AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout], [ignore])
cat stdout > dump1
OVS_WAIT_UNTIL([ ovsdb-client dump unix:db2.sock | grep zero ])
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore])
@@ -1768,16 +1758,15 @@ AT_CLEANUP
#ovsdb-server/connect-active-ovsdb-server
AT_SETUP([ovsdb-server/connect-active-server])
+on_exit 'kill `cat *.pid`'
AT_KEYWORDS([ovsdb server replication connect-active-server])
replication_schema > schema
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 db2], [0], [ignore],
[ignore])
-on_exit 'test ! -e pid2 || kill `cat pid2`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl=unixctl2 db2], [0], [ignore],
[ignore])
dnl Try to connect without specifying the active server.
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2
ovsdb-server/connect-active-ovsdb-server], [0],
@@ -1807,6 +1796,7 @@ AT_CLEANUP
#ovsdb-server/disconnect-active-server command
AT_SETUP([ovsdb-server/disconnect-active-server])
+on_exit 'kill `cat *.pid`'
AT_KEYWORDS([ovsdb server replication disconnect-active-server])
AT_SKIP_IF([test $DIFF_SUPPORTS_NORMAL_FORMAT = no])
@@ -1815,10 +1805,8 @@ AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout],
[ignore])
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
-on_exit 'test ! -e pid2 || kill `cat pid2`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl=unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
AT_CHECK([ovsdb-client transact unix:db.sock \
'[["mydb",
@@ -1864,7 +1852,7 @@ AT_CHECK([uuidfilt output], [0], [7,9c7,8
---
> _uuid name number
> ----- ---- ------
-], [ignore], [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat
pid2`])
+], [ignore])
dnl The backup server now become active, and can accept write transactions.
AT_CHECK([ovsdb-client transact unix:db2.sock \
@@ -1915,13 +1903,12 @@ dnl Start both 'db1' and 'db2' in backup mode. Let them
backup from each
dnl other. This is not an supported operation state, but to simulate a start
dnl up condition where an HA manger can select which one to be an active
dnl server soon after.
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1
--sync-from=unix:db2.sock --active ], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
+on_exit 'kill `cat *.pid`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1
--sync-from=unix:db2.sock --active ], [0], [ignore], [ignore])
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl
ovsdb-server/connect-active-ovsdb-server])
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
-on_exit 'test ! -e pid2 || kill `cat pid2`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2
--sync-from=unix:db.sock db2], [0], [ignore], [ignore])
dnl
dnl make sure both servers reached the replication state
@@ -1989,8 +1976,8 @@ AT_CHECK([ovsdb-tool transact db \
"row": {"number": 9, "name": "nine"}}]]'], [0], [ignore], [ignore])
dnl Start 'db', then try to be a back up server of itself.
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server.log
--pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db
--sync-from=unix:db.sock --active ], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
+on_exit 'kill `cat *.pid`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server.log
--pidfile --remote=punix:db.sock --unixctl="`pwd`"/unixctl db
--sync-from=unix:db.sock --active ], [0], [ignore], [ignore])
dnl Save the current content
AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout])
@@ -2008,6 +1995,7 @@ AT_CHECK([diff dump1 dump2])
AT_CLEANUP
AT_SETUP([ovsdb-server/read-only db:ptcp connection])
+on_exit 'kill `cat *.pid`'
AT_KEYWORDS([ovsdb server read-only])
AT_DATA([schema],
[[{"name": "mydb",
@@ -2096,12 +2084,10 @@ AT_CHECK([ovsdb-tool transact db2 \
"row": {"number": 10, "name": "ten"}}]]'], [0], [ignore], [ignore])
dnl Start both 'db1' and 'db2'.
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1
--active ], [0], [ignore], [ignore])
-on_exit 'test ! -e pid || kill `cat pid`'
-
+on_exit 'kill `cat *.pid`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log
--pidfile --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1 --active ], [0],
[ignore], [ignore])
-AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 db2],
[0], [ignore], [ignore])
-on_exit 'test ! -e pid2 || kill `cat pid2`'
+AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log
--pidfile=2.pid --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 db2], [0],
[ignore], [ignore])
OVS_WAIT_UNTIL([ovs-appctl -t "`pwd`"/unixctl ovsdb-server/sync-status |grep
active])
OVS_WAIT_UNTIL([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/sync-status |grep
active])
@@ -2201,7 +2187,7 @@ dnl Starting a dummy server only to reserve some tcp port.
AT_CHECK([cp db db.tmp])
AT_CHECK([ovsdb-server -vfile -vvlog:off --log-file=listener.log dnl
--detach --no-chdir dnl
- --pidfile=pid2 --unixctl=unixctl2 dnl
+ --pidfile=2.pid --unixctl=unixctl2 dnl
--remote=ptcp:0:127.0.0.1 dnl
db.tmp], [0], [stdout], [stderr])
PARSE_LISTENING_PORT([listener.log], [BAD_TCP_PORT])
--
2.35.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
