diff options
| author | Michael Goulish <mgoulish@apache.org> | 2009-09-23 09:39:12 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2009-09-23 09:39:12 +0000 |
| commit | 7286c00b988ef9b1bdf16a62e3527d62ca123a7a (patch) | |
| tree | a9d84c98193c9dc04668ee5a0fc8deeb98ab4c38 /cpp/src/tests/clustered_replication_test | |
| parent | faa6d36cab39fb3ee05a9dcf26a1cdb5d027ec07 (diff) | |
| download | qpid-python-7286c00b988ef9b1bdf16a62e3527d62ca123a7a.tar.gz | |
rhs's new system for python allows us to build python test
code that is appropriate for the installed python version,
and place the code at any desired location. This is a big
improvement in making the builds automatically adapt to
different OSs.
From src/tests/Makefile.am, I am calling his gadget to
create the code, and placing it all in PYTHON_DIR/temp.
Then altering the paths in a bunch of test scripts to point
to the right places.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@818020 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/clustered_replication_test')
| -rwxr-xr-x | cpp/src/tests/clustered_replication_test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/tests/clustered_replication_test b/cpp/src/tests/clustered_replication_test index cc331957ad..e3bc9cb65e 100755 --- a/cpp/src/tests/clustered_replication_test +++ b/cpp/src/tests/clustered_replication_test @@ -22,7 +22,7 @@ # Test reliability of the replication feature in the face of link # failures: srcdir=`dirname $0` -PYTHON_DIR=$srcdir/../../../python +PYTHON_DIR=$srcdir/../../../python/temp export PYTHONPATH=$PYTHON_DIR trap stop_brokers INT EXIT @@ -89,8 +89,8 @@ EOF #start first node of primary cluster and set up test queue echo Starting primary cluster PRIMARY1=$(with_ais_group ../qpidd $GENERAL_OPTS $PRIMARY_OPTS --log-to-file repl.primary.1.tmp) || fail "Could not start node" - $PYTHON_DIR/commands/qpid-config -a "localhost:$PRIMARY1" add queue test-queue --generate-queue-events 2 - $PYTHON_DIR/commands/qpid-config -a "localhost:$PRIMARY1" add queue control-queue --generate-queue-events 1 + $PYTHON_DIR/qpid-config -a "localhost:$PRIMARY1" add queue test-queue --generate-queue-events 2 + $PYTHON_DIR/qpid-config -a "localhost:$PRIMARY1" add queue control-queue --generate-queue-events 1 #send 10 messages, consume 5 of them for i in `seq 1 10`; do echo Message$i; done | ./sender --port $PRIMARY1 @@ -105,10 +105,10 @@ EOF DR1=$(with_ais_group ../qpidd $GENERAL_OPTS $DR_OPTS --log-to-file repl.dr.1.tmp) DR2=$(with_ais_group ../qpidd $GENERAL_OPTS $DR_OPTS --log-to-file repl.dr.2.tmp) - $PYTHON_DIR/commands/qpid-config -a "localhost:$DR1" add queue test-queue - $PYTHON_DIR/commands/qpid-config -a "localhost:$DR1" add queue control-queue - $PYTHON_DIR/commands/qpid-config -a "localhost:$DR1" add exchange replication REPLICATION_EXCHANGE - $PYTHON_DIR/commands/qpid-route queue add localhost:$DR2 localhost:$PRIMARY2 REPLICATION_EXCHANGE REPLICATION_QUEUE + $PYTHON_DIR/qpid-config -a "localhost:$DR1" add queue test-queue + $PYTHON_DIR/qpid-config -a "localhost:$DR1" add queue control-queue + $PYTHON_DIR/qpid-config -a "localhost:$DR1" add exchange replication REPLICATION_EXCHANGE + $PYTHON_DIR/qpid-route queue add localhost:$DR2 localhost:$PRIMARY2 REPLICATION_EXCHANGE REPLICATION_QUEUE #send more messages to primary for i in `seq 11 20`; do echo Message$i; done | ./sender --port $PRIMARY1 --send-eos 1 |