From 3de19b33102ca1c5be0cafabb5777d902763d2a5 Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Thu, 19 Nov 2009 23:02:07 +0000
Subject: 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@882346 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/testkit/bin/qpid-python-testkit |  6 ++++--
 qpid/java/testkit/bin/setenv.sh           | 17 +++++++++++++----
 qpid/java/testkit/testkit.py              |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/testkit/bin/qpid-python-testkit b/qpid/java/testkit/bin/qpid-python-testkit
index 3584e14d88..e1696ff722 100755
--- a/qpid/java/testkit/bin/qpid-python-testkit
+++ b/qpid/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/qpid/java/testkit/bin/setenv.sh b/qpid/java/testkit/bin/setenv.sh
index c2a0c46d55..3ddb6b606f 100644
--- a/qpid/java/testkit/bin/setenv.sh
+++ b/qpid/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/qpid/java/testkit/testkit.py b/qpid/java/testkit/testkit.py
index 1cfc7a5e59..66623b9b8c 100755
--- a/qpid/java/testkit/testkit.py
+++ b/qpid/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])
-- 
cgit v1.2.1