summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/run_acl_tests
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2016-04-21 22:29:16 +0000
committerJustin Ross <jross@apache.org>2016-04-21 22:29:16 +0000
commitaa92704be9e608a3437858ce9e9ced9a22e49f1f (patch)
treef5e2aa553fc0782694ea4d30b7ecc2a30ecc50d0 /qpid/cpp/src/tests/run_acl_tests
parentc1370cebea3c565bb87bd8119b902703680a71a7 (diff)
downloadqpid-python-aa92704be9e608a3437858ce9e9ced9a22e49f1f.tar.gz
QPID-7207: Use Python 2.6 compatible string formats
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1740424 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_acl_tests')
-rwxr-xr-xqpid/cpp/src/tests/run_acl_tests20
1 files changed, 10 insertions, 10 deletions
diff --git a/qpid/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 831fc7fbc7..dc6b9e8272 100755
--- a/qpid/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
@@ -22,7 +22,7 @@
from common import *
policy_file = join(BUILD_DIR, "src", "tests", "policy.acl")
-broker_args = "--acl-file {}".format(policy_file)
+broker_args = "--acl-file {0}".format(policy_file)
broker_port = start_broker("broker", broker_args, "--log-enable debug+:acl")
broker_i_port = start_broker("broker_i", broker_args, "--connection-limit-per-ip 2")
@@ -30,10 +30,10 @@ broker_u_port = start_broker("broker_u", broker_args, "--connection-limit-per-us
broker_q_port = start_broker("broker_q", broker_args, "--max-queues-per-user 2")
run_broker_tests(broker_port, "-m acl",
- "-Dport-i={}".format(broker_i_port),
- "-Dport-u={}".format(broker_u_port),
- "-Dport-q={}".format(broker_q_port),
- "-Dpolicy-file={}".format(policy_file))
+ "-Dport-i={0}".format(broker_i_port),
+ "-Dport-u={0}".format(broker_u_port),
+ "-Dport-q={0}".format(broker_q_port),
+ "-Dpolicy-file={0}".format(policy_file))
# Test interaction of authentication and link creation
@@ -44,12 +44,12 @@ configure_broker(broker_1_port, "add exchange topic fed.topic")
configure_broker(broker_2_port, "add exchange topic fed.topic")
connect_brokers("dynamic add",
- "localhost:{}".format(broker_1_port),
- "localhost:{}".format(broker_2_port),
+ "localhost:{0}".format(broker_1_port),
+ "localhost:{0}".format(broker_2_port),
"fed.topic")
sasl_config_dir = join(BUILD_DIR, "src", "tests", "sasl_config")
-broker_args = "--auth yes --sasl-config {}".format(sasl_config_dir)
+broker_args = "--auth yes --sasl-config {0}".format(sasl_config_dir)
broker_3_port = start_broker("broker_3", broker_args, auth_disabled=False)
broker_4_port = start_broker("broker_4", broker_args, auth_disabled=False)
@@ -59,8 +59,8 @@ configure_broker(broker_4_port, "add exchange topic fed.topic")
try:
connect_brokers("dynamic add",
- "localhost:{}".format(broker_3_port),
- "localhost:{}".format(broker_4_port),
+ "localhost:{0}".format(broker_3_port),
+ "localhost:{0}".format(broker_4_port),
"fed.topic")
fail("Broker with no ACLs but auth enabled did not deny link creation")