From: Ethan Jackson <ethan@nicira.com>
Date: Tue, 6 Mar 2012 21:20:06 +0000 (-0800)
Subject: unixctl: Re-enable unit tests.
X-Git-Tag: sliver-openvswitch-0.1-1~273
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87cf07675bf45a0b15735d28380263a8d4da8642;p=sliver-openvswitch.git

unixctl: Re-enable unit tests.

The transient failure in the unixctl unit tests likely still
exists, but we've added additional instrumentation to our build
tools to help us debug it.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at
index f87611a46..1d435baab 100644
--- a/tests/unixctl-py.at
+++ b/tests/unixctl-py.at
@@ -1,7 +1,6 @@
 AT_BANNER([unixctl])
 
 AT_SETUP([unixctl ovs-vswitchd exit - Python])
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 OVS_VSWITCHD_START
 
@@ -13,7 +12,6 @@ OVS_WAIT_WHILE([test -s ovsdb-server.pid])
 AT_CLEANUP
 
 AT_SETUP([unixctl ovs-vswitchd help - Python])
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 OVS_VSWITCHD_START
 
@@ -29,7 +27,6 @@ AT_CLEANUP
 
 
 AT_SETUP([unixctl ovs-vswitchd arguments - Python])
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 OVS_VSWITCHD_START
 
@@ -73,7 +70,6 @@ AT_CLEANUP
 
 AT_SETUP([unixctl bad target - Python])
 OVS_RUNDIR=$PWD; export OVS_RUNDIR
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 
 AT_CHECK([$PYTHON $srcdir/appctl.py -t bogus doit], [1], [], [stderr])
@@ -89,7 +85,6 @@ appctl.py: cannot connect to "/bogus/path.pid" (No such file or directory)
 AT_CLEANUP
 
 AT_SETUP([unixctl server - Python])
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 OVS_RUNDIR=$PWD; export OVS_RUNDIR
 OVS_LOGDIR=$PWD; export OVS_LOGDIR
@@ -159,7 +154,6 @@ AT_CLEANUP
 
 
 AT_SETUP([unixctl server errors - Python])
-AT_SKIP_IF([:])
 AT_SKIP_IF([test $HAVE_PYTHON = no])
 AT_CHECK($PYTHON $srcdir/test-unixctl.py --unixctl $PWD/bogus/path, [1], [], [ignore])
 AT_CLEANUP