diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2009-11-19 23:02:07 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2009-11-19 23:02:07 +0000 |
| commit | 3c9a8fdd71d8d1e29de4da3126cf35e1a88a069b (patch) | |
| tree | 1e222643da2c093ebf1782361741ada780977d74 /java | |
| parent | 003364c3f387a158cf7a7e3cdfd5e2ddc38eae57 (diff) | |
| download | qpid-python-3c9a8fdd71d8d1e29de4da3126cf35e1a88a069b.tar.gz | |
Uncommented the other two tests
Modified the scripts to work out the errors.
It's now in a reasonable state to start expanding the tests.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@882346 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rwxr-xr-x | java/testkit/bin/qpid-python-testkit | 6 | ||||
| -rw-r--r-- | java/testkit/bin/setenv.sh | 17 | ||||
| -rwxr-xr-x | java/testkit/testkit.py | 4 |
3 files changed, 19 insertions, 8 deletions
diff --git a/java/testkit/bin/qpid-python-testkit b/java/testkit/bin/qpid-python-testkit index 3584e14d88..e1696ff722 100755 --- a/java/testkit/bin/qpid-python-testkit +++ b/java/testkit/bin/qpid-python-testkit @@ -26,7 +26,9 @@ export PYTHONPATH=../:$PYTHONPATH -echo $PYTHONPATH +if [ -d $OUTDIR ]; then + rm -rf $OUTDIR +fi -$PYTHON_DIR/qpid-python-test -m testkit +$PYTHON_DIR/qpid-python-test -DOUTDIR=$OUTDIR -m testkit diff --git a/java/testkit/bin/setenv.sh b/java/testkit/bin/setenv.sh index c2a0c46d55..3ddb6b606f 100644 --- a/java/testkit/bin/setenv.sh +++ b/java/testkit/bin/setenv.sh @@ -17,6 +17,13 @@ # under the License. # +abs_path() +{ + D=`dirname "$1"` + B=`basename "$1"` + echo "`cd \"$D\" 2>/dev/null && pwd || echo \"$D\"`/$B" +} + # Environment for python tests test -d ../../../python || { echo "WARNING: skipping test, no python directory."; exit 0; } PYTHON_DIR=../../../python @@ -24,20 +31,22 @@ PYTHONPATH=$PYTHON_DIR:$PYTHON_DIR/qpid if [ "$QPIDD_EXEC" = "" ] ; then test -x ../../../cpp/src/qpidd || { echo "WARNING: skipping test, QPIDD_EXEC not set and qpidd not found."; exit 0; } - QPIDD_EXEC=../../../cpp/src/qpidd + QPIDD_EXEC=`abs_path "../../../cpp/src/qpidd"` + #QPIDD_EXEC=/opt/workspace/qpid/trunk/qpid/cpp/src/.libs/lt-qpidd fi if [ "$CLUSTER_LIB" = "" ] ; then test -x ../../../cpp/src/.libs/cluster.so || { echo "WARNING: skipping test, CLUSTER_LIB not set and cluster.so not found."; exit 0; } - CLUSTER_LIB=../../../cpp/src/.libs/cluster.so + CLUSTER_LIB=`abs_path "../../../cpp/src/.libs/cluster.so"` + #CLUSTER_LIB=/opt/workspace/qpid/trunk/qpid/cpp/src/.libs/cluster.so fi if [ "$QP_CP" = "" ] ; then QP_CP=`find ../../build/lib/ -name '*.jar' | tr '\n' ':'` fi -if [ "$QUTDIR" = "" ] ; then - OUTDIR=../ +if [ "$OUTDIR" = "" ] ; then + OUTDIR=`abs_path "../output"` fi diff --git a/java/testkit/testkit.py b/java/testkit/testkit.py index 1cfc7a5e59..66623b9b8c 100755 --- a/java/testkit/testkit.py +++ b/java/testkit/testkit.py @@ -120,7 +120,7 @@ class JavaClientTest(BrokerTest): class ConcurrencyTest(JavaClientTest): """A concurrency test suite for the JMS client""" - def xtest_multiplexing_con(self): + def test_multiplexing_con(self): """Tests multiple sessions on a single connection""" cluster = Cluster(self, 2) @@ -174,7 +174,7 @@ class ConcurrencyTest(JavaClientTest): class SoakTest(JavaClientTest): """A soak test suite for the JMS client""" - def xtest_failover(self): + def test_failover(self): cluster = self.cluster(4, expect=EXPECT_EXIT_FAIL) p = cluster[0].port self.start_error_watcher(broker=cluster[0]) |