Commit a890678229 (userspace: Log version on startup.) added
additional logging to ovsdb-server and ovs-vswitchd, but failed to
make certain the unit tests still passed.
Signed-off-by: Ethan Jackson <et...@nicira.com>
---
tests/ofproto-macros.at | 5 ++++-
tests/ovsdb-server.at | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index b0c4fa0..e7d6da4 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -41,7 +41,9 @@ m4_define([OVS_VSWITCHD_START],
dnl Start ovsdb-server.
AT_CHECK([ovsdb-server --detach --pidfile --log-file
--remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr])
- AT_CHECK([[sed < stderr '/vlog|INFO|opened log file/d']])
+ AT_CHECK([[sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d']])
AT_CAPTURE_FILE([ovsdb-server.log])
dnl Initialize database.
@@ -52,6 +54,7 @@ m4_define([OVS_VSWITCHD_START],
AT_CAPTURE_FILE([ovs-vswitchd.log])
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
/reconnect|INFO|/d
/ofproto|INFO|using datapath ID/d
/ofproto|INFO|datapath ID changed to fedcba9876543210/d']])
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index f5db1a8..56bd776 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -48,7 +48,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"table": "ordinals",
"row": {"number": 0, "name": "zero"}}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [ignore])
cat stdout >> output
dnl Add some crap to the database log and run another transaction, which should
dnl ignore the crap and truncate it out of the log.
@@ -73,7 +73,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"where": [],
"sort": ["number"]}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [ignore])
cat stdout >> output
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0],
[[[{"uuid":["uuid","<0>"]}]
@@ -94,7 +94,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"table": "ordinals",
"row": {"number": 0, "name": "zero"}}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [ignore])
cat stdout >> output
dnl Add some crap to the database log and run another transaction, which should
dnl ignore the crap and truncate it out of the log.
@@ -120,7 +120,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"where": [],
"sort": ["number"]}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db
--run="sh txnfile"], [0], [stdout], [ignore])
cat stdout >> output
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0],
[[[{"uuid":["uuid","<0>"]}]
--
1.7.11.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
