diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-03-22 15:53:52 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-03-22 15:53:52 +0000 |
| commit | d8a3332cf2b70f8eaf0442621ee05fc684656710 (patch) | |
| tree | 8c3e50cc8f57f1674f871d2847ae9d79902bbde4 | |
| parent | 4b57dd91ac5400fdfd9b5a66f793492c4cf040fc (diff) | |
| download | qpid-python-d8a3332cf2b70f8eaf0442621ee05fc684656710.tar.gz | |
QPID-4631: C++ Broker interbroker links protected by ACL
federation and federation-sys tests need acl file to allow link creation
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-4631@1459854 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_sys_tests | 4 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_tests | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/run_federation_sys_tests b/qpid/cpp/src/tests/run_federation_sys_tests index d9a9649c37..f88d313b05 100755 --- a/qpid/cpp/src/tests/run_federation_sys_tests +++ b/qpid/cpp/src/tests/run_federation_sys_tests @@ -42,7 +42,9 @@ SKIPTESTS="${SKIPTESTS} -i federation_sys.C_* -i federation_sys.D_*" start_brokers() { start_broker() { - ${QPIDD_EXEC} --daemon --port 0 --auth no --no-data-dir $1 > qpidd.port + echo acl allow all create link > $moduledir/federation-sys-tests.acl + echo acl allow all all >> $moduledir/federation-sys-tests.acl + ${QPIDD_EXEC} --daemon --port 0 --auth no --no-data-dir --load-module acl.so --acl-file $moduledir/federation-sys-tests.acl $1 > qpidd.port PORT=`cat qpidd.port` eval "$2=${PORT}" } diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests index c2ee550226..1e7fdcb047 100755 --- a/qpid/cpp/src/tests/run_federation_tests +++ b/qpid/cpp/src/tests/run_federation_tests @@ -33,9 +33,11 @@ else SKIPTESTS='-i *_xml' # note: single quotes prevent expansion of * fi -QPIDD_CMD="../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no --log-enable=info+ --log-enable=debug+:Bridge --log-to-file" +QPIDD_CMD="../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no --log-enable=info+ --log-enable=debug+:Bridge --load-module acl.so --acl-file $moduledir/federation-tests.acl --log-to-file" start_brokers() { - rm -f fed_local.log fed_remote.log fed_b1.log fed_b2.log + rm -f fed_local.log fed_remote.log fed_b1.log fed_b2.log $moduledir/federation-tests.acl + echo acl allow all create link > $moduledir/federation-tests.acl + echo acl allow all all >> $moduledir/federation-tests.acl LOCAL_PORT=$($QPIDD_CMD fed_local.log --federation-tag LOCAL) REMOTE_PORT=$($QPIDD_CMD fed_remote.log --federation-tag REMOTE) REMOTE_B1=$($QPIDD_CMD fed_b1.log --federation-tag B1) |