The daemon code works fine, these tests didn't. No one has debugged them over a period of years so we might as well remove them.
Signed-off-by: Ben Pfaff <b...@nicira.com> --- tests/daemon.at | 46 ---------------------------------------------- 1 files changed, 0 insertions(+), 46 deletions(-) diff --git a/tests/daemon.at b/tests/daemon.at index f188e7c..8ac70e8 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -152,49 +152,3 @@ AT_CHECK([grep 'ovsdb-server: could not initialize control socket' stderr], [0], [ignore], []) AT_CHECK([test ! -s pid]) AT_CLEANUP - -# xxx This test hangs frequently, which often prevents builds from -# xxx completing. Skip this test until we have time to debug it. -AT_SETUP([daemon --detach closes standard fds]) -AT_SKIP_IF([:]) -AT_CAPTURE_FILE([pid]) -AT_CAPTURE_FILE([status]) -AT_CAPTURE_FILE([stderr]) -OVSDB_INIT([db]) -AT_CHECK([(yes 2>stderr; echo $? > status) | ovsdb-server --detach --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl db], [0], [], []) -AT_CHECK([kill `cat pid`]) -AT_CHECK([test -s status]) -if grep '[[bB]]roken pipe' stderr >/dev/null 2>&1; then - # Something in the environment caused SIGPIPE to be ignored, but - # 'yes' at least told us that it got EPIPE. Good enough; we know - # that stdout was closed. - : -else - # Otherwise make sure that 'yes' died from SIGPIPE. - AT_CHECK([kill -l `cat status`], [0], [PIPE -]) -fi -AT_CLEANUP - -# xxx This test hangs frequently, which often prevents builds from -# xxx completing. Skip this test until we have time to debug it. -AT_SETUP([daemon --detach --monitor closes standard fds]) -AT_SKIP_IF([:]) -AT_CAPTURE_FILE([pid]) -AT_CAPTURE_FILE([status]) -AT_CAPTURE_FILE([stderr]) -OVSDB_INIT([db]) -AT_CHECK([(yes 2>stderr; echo $? > status) | ovsdb-server --detach --monitor --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl db], [0], [], []) -AT_CHECK([kill `cat pid`]) -AT_CHECK([test -s status]) -if grep '[[bB]]roken pipe' stderr >/dev/null 2>&1; then - # Something in the environment caused SIGPIPE to be ignored, but - # 'yes' at least told us that it got EPIPE. Good enough; we know - # that stdout was closed. - : -else - # Otherwise make sure that 'yes' died from SIGPIPE. - AT_CHECK([kill -l `cat status`], [0], [PIPE -]) -fi -AT_CLEANUP -- 1.7.2.5 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
