diff options
Diffstat (limited to 'qpid/cpp/src/tests/ipv6_test')
| -rwxr-xr-x | qpid/cpp/src/tests/ipv6_test | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/qpid/cpp/src/tests/ipv6_test b/qpid/cpp/src/tests/ipv6_test index 18bb34daa6..b7244434b2 100755 --- a/qpid/cpp/src/tests/ipv6_test +++ b/qpid/cpp/src/tests/ipv6_test @@ -33,7 +33,7 @@ fi # Run a simple test over IPv6 -source ./test_env.sh +source $QPID_TEST_COMMON CONFIG=$(dirname $0)/config.null TEST_HOSTNAME=::1 @@ -95,30 +95,26 @@ stop_brokers # Start 2 brokers # In a distribution, the python tools will be absent. -if [ ! -f $QPID_CONFIG_EXEC ] || [ ! -f $QPID_ROUTE_EXEC ] ; then - echo "python tools absent - skipping federation test." -else +ensure_python_tests - start_brokers 2 - echo "Started Federated brokers on ports ${PORTS[*]}" - # Make broker urls - BROKER0="[::1]:${PORTS[0]}" - BROKER1="[::1]:${PORTS[1]}" - TEST_QUEUE=ipv6-fed-test +start_brokers 2 +echo "Started Federated brokers on ports ${PORTS[*]}" +# Make broker urls +BROKER0="[::1]:${PORTS[0]}" +BROKER1="[::1]:${PORTS[1]}" +TEST_QUEUE=ipv6-fed-test - $QPID_CONFIG_EXEC -b $BROKER0 add queue $TEST_QUEUE - $QPID_CONFIG_EXEC -b $BROKER1 add queue $TEST_QUEUE - $QPID_ROUTE_EXEC dynamic add $BROKER1 $BROKER0 amq.direct - $QPID_CONFIG_EXEC -b $BROKER1 bind amq.direct $TEST_QUEUE $TEST_QUEUE - $QPID_ROUTE_EXEC route map $BROKER1 +$QPID_CONFIG_EXEC -b $BROKER0 add queue $TEST_QUEUE +$QPID_CONFIG_EXEC -b $BROKER1 add queue $TEST_QUEUE +$QPID_ROUTE_EXEC dynamic add $BROKER1 $BROKER0 amq.direct +$QPID_CONFIG_EXEC -b $BROKER1 bind amq.direct $TEST_QUEUE $TEST_QUEUE +$QPID_ROUTE_EXEC route map $BROKER1 - ./datagen --count 100 | tee rdata-in | - ./qpid-send -b amqp:$BROKER0 -a amq.direct/$TEST_QUEUE --content-stdin - ./qpid-receive -b amqp:$BROKER1 -a $TEST_QUEUE --print-content yes -m 0 > rdata-out +./datagen --count 100 | tee rdata-in | + ./qpid-send -b amqp:$BROKER0 -a amq.direct/$TEST_QUEUE --content-stdin +./qpid-receive -b amqp:$BROKER1 -a $TEST_QUEUE --print-content yes -m 0 > rdata-out - cmp rdata-in rdata-out || { echo "Federated data over IPv6 does not compare"; exit 1; } - - stop_brokers - rm rdata-in rdata-out -fi +cmp rdata-in rdata-out || { echo "Federated data over IPv6 does not compare"; exit 1; } +stop_brokers +rm rdata-in rdata-out |