X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Funixctl-py.at;h=b54d4091fbb491fc2eda6cdc8e6eceec40dbccee;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=15fd86be8f5a021344efe32b3297bde21ff31000;hpb=f973f2af2fd4452c8e182caf6a4346cf2a2a394e;p=sliver-openvswitch.git diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at index 15fd86be8..b54d4091f 100644 --- a/tests/unixctl-py.at +++ b/tests/unixctl-py.at @@ -94,7 +94,7 @@ OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR -trap 'kill `cat test-unixctl.py.pid`' 0 +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]) @@ -159,7 +159,6 @@ 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