svn commit: r882346 - in /qpid/trunk/qpid/java/testkit: bin/qpid-python-testkit bin/setenv.sh testkit.py

[ra...@apache.org]

Author: rajith
Date: Thu Nov 19 23:02:07 2009
New Revision: 882346

URL: http://svn.apache.org/viewvc?rev=882346&view=rev
Log:
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.

Modified:
    qpid/trunk/qpid/java/testkit/bin/qpid-python-testkit
    qpid/trunk/qpid/java/testkit/bin/setenv.sh
    qpid/trunk/qpid/java/testkit/testkit.py

Modified: qpid/trunk/qpid/java/testkit/bin/qpid-python-testkit
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/bin/qpid-python-testkit?rev=882346&r1=882345&r2=882346&view=diff
==============================================================================
--- qpid/trunk/qpid/java/testkit/bin/qpid-python-testkit (original)
+++ qpid/trunk/qpid/java/testkit/bin/qpid-python-testkit Thu Nov 19 23:02:07 2009
@@ -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
 

Modified: qpid/trunk/qpid/java/testkit/bin/setenv.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/bin/setenv.sh?rev=882346&r1=882345&r2=882346&view=diff
==============================================================================
--- qpid/trunk/qpid/java/testkit/bin/setenv.sh (original)
+++ qpid/trunk/qpid/java/testkit/bin/setenv.sh Thu Nov 19 23:02:07 2009
@@ -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 @@
 
 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
 
 

Modified: qpid/trunk/qpid/java/testkit/testkit.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/testkit.py?rev=882346&r1=882345&r2=882346&view=diff
==============================================================================
--- qpid/trunk/qpid/java/testkit/testkit.py (original)
+++ qpid/trunk/qpid/java/testkit/testkit.py Thu Nov 19 23:02:07 2009
@@ -120,7 +120,7 @@
 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 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])



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org