X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Funixctl-py.at;h=b54d4091fbb491fc2eda6cdc8e6eceec40dbccee;hb=6d308b28c023e864925b1a6775b3b91d215e89bf;hp=8317add8b2d619ab17b732d6326d6586226125ae;hpb=f4ec6ff479ace8f9b893f883557235f2ea6bab8f;p=sliver-openvswitch.git

diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at
index 8317add8b..b54d4091f 100644
--- a/tests/unixctl-py.at
+++ b/tests/unixctl-py.at
@@ -72,12 +72,13 @@ OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([unixctl bad target - Python])
-OVS_RUNDIR=$PWD; export OVS_RUNDIR
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+OVS_DBDIR=`pwd`; export OVS_DBDIR
 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 +90,12 @@ 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])
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+OVS_LOGDIR=`pwd`; export OVS_LOGDIR
+OVS_DBDIR=`pwd`; export OVS_DBDIR
+OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
+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 +106,16 @@ The available commands are:
   echo_error              [[arg ...]]
   exit
   help
+  log                     [[arg ...]]
   version
+  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 +159,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