projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Use vsctl_fatal() consistently.
[openvswitch]
/
tests
/
ovsdb-server.at
diff --git
a/tests/ovsdb-server.at
b/tests/ovsdb-server.at
index 0d8752423b8ecd009985e500ac2ea5ef7eb9851e..0b0218995a1505dc1438d4a0a684738721d2bb2d 100644
(file)
--- a/
tests/ovsdb-server.at
+++ b/
tests/ovsdb-server.at
@@
-1,5
+1,10
@@
AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)])
AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)])
+m4_define([OVSDB_SERVER_SHUTDOWN],
+ [cp pid savepid
+ AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore])
+ OVS_WAIT_WHILE([kill -0 `cat savepid`], [kill `cat savepid`])])
+
# OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS])
#
# Creates a database with the given SCHEMA, starts an ovsdb-server on
# OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS])
#
# Creates a database with the given SCHEMA, starts an ovsdb-server on
@@
-28,7
+33,7
@@
cat stdout >> output
])
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore],
[test ! -e pid || kill `cat pid`])
])
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore],
[test ! -e pid || kill `cat pid`])
- test ! -e pid || kill `cat pid`
+ OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
EXECUTION_EXAMPLES
AT_CLEANUP])
EXECUTION_EXAMPLES
@@
-63,7
+68,7
@@
AT_CHECK(
]],
[ignore],
[test ! -e pid || kill `cat pid`])
]],
[ignore],
[test ! -e pid || kill `cat pid`])
-test ! -e pid || kill `cat pid`
+OVSDB_SERVER_SHUTDOWN
AT_CLEANUP
\f
AT_BANNER([OVSDB -- ovsdb-server transactions (SSL sockets)])
AT_CLEANUP
\f
AT_BANNER([OVSDB -- ovsdb-server transactions (SSL sockets)])
@@
-100,7
+105,7
@@
cat stdout >> output
])
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore],
[test ! -e pid || kill `cat pid`])
])
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore],
[test ! -e pid || kill `cat pid`])
- test ! -e pid || kill `cat pid`
+ OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
EXECUTION_EXAMPLES
AT_CLEANUP])
EXECUTION_EXAMPLES