diff options
| author | Alan Conway <aconway@apache.org> | 2009-09-28 21:17:31 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-09-28 21:17:31 +0000 |
| commit | 425d83fc95aa42e155341aac20b814d4bf7bae08 (patch) | |
| tree | 7b0e8d1ff13b566d6e844a71f1da0fbadb0ee3f3 /qpid/cpp/src/tests/federated_cluster_test | |
| parent | 2765f90b4b80043f8f3d8e15afe14ad8e4cbd49e (diff) | |
| download | qpid-python-425d83fc95aa42e155341aac20b814d4bf7bae08.tar.gz | |
Fix python tests to work in VPATH builds and for make distcheck.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@819738 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/federated_cluster_test')
| -rwxr-xr-x | qpid/cpp/src/tests/federated_cluster_test | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/qpid/cpp/src/tests/federated_cluster_test b/qpid/cpp/src/tests/federated_cluster_test index d4b917535e..7f2442451e 100755 --- a/qpid/cpp/src/tests/federated_cluster_test +++ b/qpid/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/temp +. $srcdir/python_env.sh trap stop_brokers EXIT @@ -61,22 +61,21 @@ start_brokers() { } setup() { - export PYTHONPATH=$PYTHON_DIR #create exchange on both cluster and single broker - $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 + $PYTHON_COMMANDS/qpid-config -a "localhost:$BROKER_A" add exchange direct test-exchange + $PYTHON_COMMANDS/qpid-config -a "localhost:$NODE_1" add exchange direct test-exchange #create dynamic routes for 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 + $PYTHON_COMMANDS/qpid-route dynamic add "localhost:$NODE_2" "localhost:$BROKER_A" test-exchange + $PYTHON_COMMANDS/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/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 + $PYTHON_COMMANDS/qpid-config -a "localhost:$NODE_1" add queue test-queue + $PYTHON_COMMANDS/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/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 + $PYTHON_COMMANDS/qpid-config -a "localhost:$BROKER_A" add queue test-queue + $PYTHON_COMMANDS/qpid-config -a "localhost:$BROKER_A" bind test-exchange test-queue from-cluster } run_test_pull_to_cluster_two_consumers() { |