vlog: Add vlog/close command.

[cascardo/ovs.git] / tests / unixctl-py.at

diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at
index 8317add..4838d2d 100644 (file)
--- a/tests/unixctl-py.at
+++ b/tests/unixctl-py.at
@@ -14,16 +14,16 @@ AT_CHECK([PYAPPCTL -t ovsdb-server exit], [0], [])
 OVS_WAIT_WHILE([test -s ovsdb-server.pid])
 AT_CLEANUP
 
-AT_SETUP([unixctl ovs-vswitchd help - Python])
+AT_SETUP([unixctl ovs-vswitchd list-commands - Python])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 OVS_VSWITCHD_START
 
-AT_CHECK([APPCTL help], [0], [stdout])
+AT_CHECK([APPCTL list-commands], [0], [stdout])
 AT_CHECK([head -1 stdout], [0], [dnl
 The available commands are:
 ])
 mv stdout expout
-AT_CHECK([PYAPPCTL help], [0], [expout])
+AT_CHECK([PYAPPCTL list-commands], [0], [expout])
 
 OVS_VSWITCHD_STOP
 AT_CLEANUP
@@ -72,12 +72,11 @@ OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([unixctl bad target - Python])
-OVS_RUNDIR=$PWD; export OVS_RUNDIR
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 
 AT_CHECK([PYAPPCTL -t bogus doit], [1], [], [stderr])
 AT_CHECK_UNQUOTED([tail -1 stderr], [0], [dnl
-appctl.py: cannot read pidfile "$PWD/bogus.pid" (No such file or directory)
+appctl.py: cannot read pidfile "`pwd`/bogus.pid" (No such file or directory)
 ])
 
 AT_CHECK([PYAPPCTL -t /bogus/path.pid doit], [1], [], [stderr])
@@ -89,11 +88,8 @@ AT_CLEANUP
 
 AT_SETUP([unixctl server - Python])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
-OVS_RUNDIR=$PWD; export OVS_RUNDIR
-OVS_LOGDIR=$PWD; export OVS_LOGDIR
-OVS_SYSCONFDIR=$PWD; export OVS_SYSCONFDIR
-trap 'kill `cat test-unixctl.py.pid`' 0
-AT_CAPTURE_FILE([$PWD/test-unixctl.py.log])
+on_exit 'kill `cat test-unixctl.py.pid`'
+AT_CAPTURE_FILE([`pwd`/test-unixctl.py.log])
 AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file --pidfile --detach])
 
 AT_CHECK([APPCTL -t test-unixctl.py help], [0], [stdout])
@@ -104,12 +100,17 @@ The available commands are:
   echo_error              [[arg ...]]
   exit
   help
+  log                     [[arg ...]]
   version
+  vlog/close
+  vlog/list
+  vlog/reopen
+  vlog/set                spec
 ])
 mv stdout expout
 AT_CHECK([PYAPPCTL -t test-unixctl.py help], [0], [expout])
 
-AT_CHECK([echo "test-unixctl.py (Open vSwitch) $VERSION $BUILDNR" > expout])
+AT_CHECK([ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout])
 AT_CHECK([APPCTL -t test-unixctl.py version], [0], [expout])
 AT_CHECK([PYAPPCTL -t test-unixctl.py version], [0], [expout])
 
@@ -153,11 +154,10 @@ sed 's/ovs-appctl/appctl.py/' stderr > experr
 AT_CHECK([PYAPPCTL -t test-unixctl.py bogus], [2], [], [experr])
 
 AT_CHECK([APPCTL -t test-unixctl.py exit])
-trap '' 0]
 AT_CLEANUP
 
 
 AT_SETUP([unixctl server errors - Python])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CHECK($PYTHON $srcdir/test-unixctl.py --unixctl $PWD/bogus/path, [1], [], [ignore])
+AT_CHECK($PYTHON $srcdir/test-unixctl.py --unixctl "`pwd`"/bogus/path, [1], [], [ignore])
 AT_CLEANUP