From 434380a60709bb41cbed4583f6d86e9aced0e1a1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 24 Jan 2014 10:31:13 +0900 Subject: [PATCH] daemon.at: Fix stderr races When spawning ovsdb-server in background, redirect stderr to /dev/null. Otherwise, the banner output (eg. "ovsdb-server (Open vSwitch) 2.1.90") can mess stderr of the following commands and make these tests fail. Signed-off-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- tests/daemon.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/daemon.at b/tests/daemon.at index 7c30e108f..9cb4d8380 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -6,7 +6,7 @@ AT_CAPTURE_FILE([pid]) AT_CAPTURE_FILE([expected]) # Start the daemon and wait for the pidfile to get created # and that its contents are the correct pid. -AT_CHECK([ovsdb-server --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db& echo $! > expected], [0]) +AT_CHECK([ovsdb-server --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db 2>/dev/null & echo $! > expected], [0]) OVS_WAIT_UNTIL([test -s pid], [kill `cat expected`]) AT_CHECK( [pid=`cat pid` && expected=`cat expected` && test "$pid" = "$expected"], @@ -25,7 +25,7 @@ AT_CAPTURE_FILE([parent]) AT_CAPTURE_FILE([parentpid]) AT_CAPTURE_FILE([newpid]) # Start the daemon and wait for the pidfile to get created. -AT_CHECK([ovsdb-server --monitor --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db& echo $! > parent], [0]) +AT_CHECK([ovsdb-server --monitor --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db 2>/dev/null & echo $! > parent], [0]) OVS_WAIT_UNTIL([test -s pid], [kill `cat parent`]) # Check that the pidfile names a running process, # and that the parent process of that process is our child process. -- 2.43.0