summaryrefslogtreecommitdiff
path: root/cpp/src/tests/federated_cluster_test
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2009-09-18 16:53:50 +0000
committerMichael Goulish <mgoulish@apache.org>2009-09-18 16:53:50 +0000
commit34c2b770dd9a2b8d59e0c779e815704a6da0824c (patch)
tree1f861e9f08b3c15c49c849808f8ab7df749a1144 /cpp/src/tests/federated_cluster_test
parentbf4338857280ae51b8b1bb59c6151cdfa2cf1791 (diff)
downloadqpid-python-34c2b770dd9a2b8d59e0c779e815704a6da0824c.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@816715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/federated_cluster_test')
-rwxr-xr-xcpp/src/tests/federated_cluster_test18
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/tests/federated_cluster_test b/cpp/src/tests/federated_cluster_test
index a781e269d6..d4b917535e 100755
--- a/cpp/src/tests/federated_cluster_test
+++ b/cpp/src/tests/federated_cluster_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
trap stop_brokers EXIT
@@ -63,20 +63,20 @@ start_brokers() {
setup() {
export PYTHONPATH=$PYTHON_DIR
#create exchange on both cluster and single broker
- $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add exchange direct test-exchange
- $PYTHON_DIR/commands/qpid-config -a "localhost:$NODE_1" add exchange direct test-exchange
+ $PYTHON_DIR/qpid-config -a "localhost:$BROKER_A" add exchange direct test-exchange
+ $PYTHON_DIR/qpid-config -a "localhost:$NODE_1" add exchange direct test-exchange
#create dynamic routes for test exchange
- $PYTHON_DIR/commands/qpid-route dynamic add "localhost:$NODE_2" "localhost:$BROKER_A" test-exchange
- $PYTHON_DIR/commands/qpid-route dynamic add "localhost:$BROKER_A" "localhost:$NODE_2" test-exchange
+ $PYTHON_DIR/qpid-route dynamic add "localhost:$NODE_2" "localhost:$BROKER_A" test-exchange
+ $PYTHON_DIR/qpid-route dynamic add "localhost:$BROKER_A" "localhost:$NODE_2" test-exchange
#create test queue on cluster and bind it to the test exchange
- $PYTHON_DIR/commands/qpid-config -a "localhost:$NODE_1" add queue test-queue
- $PYTHON_DIR/commands/qpid-config -a "localhost:$NODE_1" bind test-exchange test-queue to-cluster
+ $PYTHON_DIR/qpid-config -a "localhost:$NODE_1" add queue test-queue
+ $PYTHON_DIR/qpid-config -a "localhost:$NODE_1" bind test-exchange test-queue to-cluster
#create test queue on single broker and bind it to the test exchange
- $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add queue test-queue
- $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" bind test-exchange test-queue from-cluster
+ $PYTHON_DIR/qpid-config -a "localhost:$BROKER_A" add queue test-queue
+ $PYTHON_DIR/qpid-config -a "localhost:$BROKER_A" bind test-exchange test-queue from-cluster
}
run_test_pull_to_cluster_two_consumers() {