You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/04/22 00:29:16 UTC
svn commit: r1740424 - in /qpid/trunk/qpid/cpp/src/tests: ./ legacystore/
linearstore/
Author: jross
Date: Thu Apr 21 22:29:16 2016
New Revision: 1740424
URL: http://svn.apache.org/viewvc?rev=1740424&view=rev
Log:
QPID-7207: Use Python 2.6 compatible string formats
Modified:
qpid/trunk/qpid/cpp/src/tests/common.py
qpid/trunk/qpid/cpp/src/tests/env.py.in
qpid/trunk/qpid/cpp/src/tests/legacystore/run_python_tests
qpid/trunk/qpid/cpp/src/tests/linearstore/run_python_tests
qpid/trunk/qpid/cpp/src/tests/plano.py
qpid/trunk/qpid/cpp/src/tests/run_acl_tests
qpid/trunk/qpid/cpp/src/tests/run_cli_tests
qpid/trunk/qpid/cpp/src/tests/run_federation_tests
qpid/trunk/qpid/cpp/src/tests/run_ha_tests
qpid/trunk/qpid/cpp/src/tests/run_idle_timeout_tests
qpid/trunk/qpid/cpp/src/tests/run_interlink_tests
qpid/trunk/qpid/cpp/src/tests/run_interop_tests
qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests
qpid/trunk/qpid/cpp/src/tests/run_paged_queue_tests
qpid/trunk/qpid/cpp/src/tests/run_performance_tests
qpid/trunk/qpid/cpp/src/tests/run_python_tests
qpid/trunk/qpid/cpp/src/tests/run_qmf_tests
qpid/trunk/qpid/cpp/src/tests/run_queue_redirect_tests
qpid/trunk/qpid/cpp/src/tests/run_transaction_tests
Modified: qpid/trunk/qpid/cpp/src/tests/common.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/common.py?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/common.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/common.py Thu Apr 21 22:29:16 2016
@@ -38,26 +38,26 @@ def _unique_id():
def make_work_dir():
prog = file_name(ARGS[0])
- name = "{}_{}".format(prog, _unique_id())
+ name = "{0}_{1}".format(prog, _unique_id())
return make_dir(join(BUILD_DIR, name))
WORK_DIR = make_work_dir()
-notice("Created work dir '{}'", WORK_DIR)
+notice("Created work dir '{0}'", WORK_DIR)
def _init_valgrind_command(command):
if VALGRIND is None:
return command, None
- log_file = join(WORK_DIR, "valgrind_{}.log".format(_unique_id()))
+ log_file = join(WORK_DIR, "valgrind_{0}.log".format(_unique_id()))
suppressions_file = join(BUILD_DIR, "src", "tests", ".valgrind.supp")
valgrind_command = [
VALGRIND,
"--leak-check=full --num-callers=25 --error-exitcode=100",
- "--log-file={}".format(log_file),
- "--suppressions={}".format(suppressions_file),
+ "--log-file={0}".format(log_file),
+ "--suppressions={0}".format(suppressions_file),
"--",
command,
]
@@ -108,7 +108,7 @@ class _Broker(object):
def __repr__(self):
args = self.port, self.proc.pid, self.proc.returncode
- return "Broker(port={}, pid={}, exit={})".format(*args)
+ return "Broker(port={0}, pid={1}, exit={2})".format(*args)
def start(self, args):
make_dir(self.dir)
@@ -121,9 +121,9 @@ class _Broker(object):
"--log-enable info+",
"--log-source yes",
"--log-to-stderr no",
- "--log-to-file {}".format(self.log_file),
- "--config {}".format(_broker_config_file),
- "--data-dir {}".format(self.data_dir),
+ "--log-to-file {0}".format(self.log_file),
+ "--config {0}".format(_broker_config_file),
+ "--data-dir {0}".format(self.data_dir),
]
if WINDOWS:
@@ -140,7 +140,7 @@ class _Broker(object):
self.command = command
self.valgrind_log_file = valgrind_log_file
- notice("Calling '{}'", self.command)
+ notice("Calling '{0}'", self.command)
write(self.command_file, self.command)
self.proc = _subprocess.Popen(self.command, shell=True,
@@ -155,7 +155,7 @@ class _Broker(object):
_brokers.append(self)
_brokers_by_port[self.port] = self
- notice("Started {}", self)
+ notice("Started {0}", self)
def _wait_for_port(self):
port = None
@@ -179,10 +179,10 @@ class _Broker(object):
if self.proc.poll() is not None:
return
- notice("Stopping {}", self)
+ notice("Stopping {0}", self)
if WINDOWS:
- call("taskkill /f /t /pid {}", self.proc.pid)
+ call("taskkill /f /t /pid {0}", self.proc.pid)
else:
self.proc.terminate()
@@ -194,12 +194,12 @@ class _Broker(object):
# codes don't mean anything there
return 0
- notice("Checking {}", self)
+ notice("Checking {0}", self)
if self.proc.returncode == 0:
return 0
- error("{} exited with code {}", self, self.proc.returncode)
+ error("{0} exited with code {1}", self, self.proc.returncode)
if self.proc.returncode == 100:
print("Valgrind reported errors:")
@@ -210,7 +210,7 @@ class _Broker(object):
flush()
- error("{} exited with code {}", self, self.proc.returncode)
+ error("{0} exited with code {1}", self, self.proc.returncode)
return self.proc.returncode
@@ -262,7 +262,7 @@ def check_results():
def _exit_handler():
if exists(WORK_DIR):
- notice("Output saved in work dir '{}'", WORK_DIR)
+ notice("Output saved in work dir '{0}'", WORK_DIR)
for broker in _brokers:
broker.stop()
@@ -272,7 +272,7 @@ _atexit.register(_exit_handler)
def configure_broker(broker_port, *args):
command = [
"qpid-config",
- "--broker localhost:{}".format(broker_port),
+ "--broker localhost:{0}".format(broker_port),
]
command += [x for x in args if x is not None]
@@ -282,7 +282,7 @@ def configure_broker(broker_port, *args)
def run_broker_tests(broker_port, *args):
command = [
"qpid-python-test",
- "--broker localhost:{}".format(broker_port),
+ "--broker localhost:{0}".format(broker_port),
"--time",
]
Modified: qpid/trunk/qpid/cpp/src/tests/env.py.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/env.py.in?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/env.py.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/env.py.in Thu Apr 21 22:29:16 2016
@@ -85,16 +85,16 @@ if STORE_LIB is None:
# Summarize
-print("PWD: {}".format(current_dir()))
-print("SOURCE_DIR: {}".format(SOURCE_DIR))
-print("BUILD_DIR: {}".format(BUILD_DIR))
+print("PWD: {0}".format(current_dir()))
+print("SOURCE_DIR: {0}".format(SOURCE_DIR))
+print("BUILD_DIR: {0}".format(BUILD_DIR))
print("PATH:")
for item in _path:
- print(" {}".format(item))
+ print(" {0}".format(item))
print("PYTHONPATH:")
for item in _python_path:
- print(" {}".format(item))
+ print(" {0}".format(item))
Modified: qpid/trunk/qpid/cpp/src/tests/legacystore/run_python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/legacystore/run_python_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/legacystore/run_python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/legacystore/run_python_tests Thu Apr 21 22:29:16 2016
@@ -35,13 +35,13 @@ from common import *
# Add our directory to the python path
-ENV["PYTHONPATH"] = "{}:{}".format(store_tests_dir, ENV["PYTHONPATH"])
+ENV["PYTHONPATH"] = "{0}:{1}".format(store_tests_dir, ENV["PYTHONPATH"])
# To debug a test, add the following options to the end of the following line:
# -v DEBUG -c qpid.messaging.io.ops [*.testName]
-port = start_broker("broker", "--load-module {}".format(STORE_LIB))
+port = start_broker("broker", "--load-module {0}".format(STORE_LIB))
-run_broker_tests(port, "-m python_tests", "-DOUTDIR={}".format(WORK_DIR))
+run_broker_tests(port, "-m python_tests", "-DOUTDIR={0}".format(WORK_DIR))
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/linearstore/run_python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/linearstore/run_python_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/linearstore/run_python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/linearstore/run_python_tests Thu Apr 21 22:29:16 2016
@@ -35,13 +35,13 @@ from common import *
# Add our directory to the python path
-ENV["PYTHONPATH"] = "{}:{}".format(store_tests_dir, ENV["PYTHONPATH"])
+ENV["PYTHONPATH"] = "{0}:{1}".format(store_tests_dir, ENV["PYTHONPATH"])
# To debug a test, add the following options to the end of the following line:
# -v DEBUG -c qpid.messaging.io.ops [*.testName]
-port = start_broker("broker", "--load-module {}".format(STORE_LIB))
+port = start_broker("broker", "--load-module {0}".format(STORE_LIB))
-run_broker_tests(port, "-m python_tests", "-DOUTDIR={}".format(WORK_DIR))
+run_broker_tests(port, "-m python_tests", "-DOUTDIR={0}".format(WORK_DIR))
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/plano.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/plano.py?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/plano.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/plano.py Thu Apr 21 22:29:16 2016
@@ -77,13 +77,13 @@ def _format_message(category, message, a
message = message.__class__.__name__
if category:
- message = "{}: {}".format(category, message)
+ message = "{0}: {1}".format(category, message)
if args:
message = message.format(*args)
script = split(_sys.argv[0])[1]
- message = "{}: {}".format(script, message)
+ message = "{0}: {1}".format(script, message)
return message
@@ -112,7 +112,7 @@ ARGS = _sys.argv
current_dir = _os.getcwd
def home_dir(user=""):
- return _os.path.expanduser("~{}".format(user))
+ return _os.path.expanduser("~{0}".format(user))
def parent_dir(path):
path = normalize_path(path)
@@ -221,7 +221,7 @@ _temp_dir = _tempfile.mkdtemp(prefix="pl
def _get_temp_file(key):
assert not key.startswith("_")
- return join(_temp_dir, "_file_{}".format(key))
+ return join(_temp_dir, "_file_{0}".format(key))
def _remove_temp_dir():
_shutil.rmtree(_temp_dir, ignore_errors=True)
@@ -264,7 +264,7 @@ def make_user_temp_dir():
return make_dir(user_temp_dir)
def copy(from_path, to_path):
- notice("Copying '{}' to '{}'", from_path, to_path)
+ notice("Copying '{0}' to '{1}'", from_path, to_path)
to_dir = parent_dir(to_path)
@@ -279,7 +279,7 @@ def copy(from_path, to_path):
return to_path
def move(from_path, to_path):
- notice("Moving '{}' to '{}'", from_path, to_path)
+ notice("Moving '{0}' to '{1}'", from_path, to_path)
_shutil.move(from_path, to_path)
@@ -291,14 +291,14 @@ def rename(path, expr, replacement):
to_name = string_replace(name, expr, replacement)
to_path = join(parent_dir, to_name)
- notice("Renaming '{}' to '{}'", path, to_path)
+ notice("Renaming '{0}' to '{1}'", path, to_path)
move(path, to_path)
return to_path
def remove(path):
- notice("Removing '{}'", path)
+ notice("Removing '{0}'", path)
if not exists(path):
return
@@ -369,7 +369,7 @@ def make_dir(dir):
# Returns the current working directory so you can change it back
def change_dir(dir):
- notice("Changing directory to '{}'", dir)
+ notice("Changing directory to '{0}'", dir)
cwd = current_dir()
_os.chdir(dir)
@@ -409,7 +409,7 @@ def _init_call(command, args, kwargs):
if "shell" not in kwargs:
kwargs["shell"] = True
- notice("Calling '{}'", command)
+ notice("Calling '{0}'", command)
return command, kwargs
@@ -428,11 +428,11 @@ def make_archive(input_dir, output_dir,
copy(input_dir, temp_input_dir)
make_dir(output_dir)
- output_file = "{}.tar.gz".format(join(output_dir, archive_stem))
+ output_file = "{0}.tar.gz".format(join(output_dir, archive_stem))
output_file = absolute_path(output_file)
with working_dir(temp_dir):
- call("tar -czf {} {}", output_file, archive_stem)
+ call("tar -czf {0} {1}", output_file, archive_stem)
return output_file
@@ -445,7 +445,7 @@ def extract_archive(archive_file, output
archive_file = absolute_path(archive_file)
with working_dir(output_dir):
- call("tar -xf {}", archive_file)
+ call("tar -xf {0}", archive_file)
return output_dir
Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests Thu Apr 21 22:29:16 2016
@@ -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_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 exc
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 exc
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")
Modified: qpid/trunk/qpid/cpp/src/tests/run_cli_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cli_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cli_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cli_tests Thu Apr 21 22:29:16 2016
@@ -42,7 +42,7 @@ xquery_file = write(join(WORK_DIR, "xque
# similar here.
if XML_LIB is not None:
- broker_args = "--load-module {}".format(XML_LIB)
+ broker_args = "--load-module {0}".format(XML_LIB)
test_args = ""
else:
notice("Ignoring XML tests")
@@ -55,9 +55,9 @@ remote_port = start_broker("remote", bro
run_broker_tests(local_port,
"-m cli_tests",
- "-Dremote-port={}".format(remote_port),
- "-Dcli-dir={}".format(cli_dir),
- "-Dxquery-file={}".format(xquery_file),
+ "-Dremote-port={0}".format(remote_port),
+ "-Dcli-dir={0}".format(cli_dir),
+ "-Dxquery-file={0}".format(xquery_file),
test_args)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_federation_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_federation_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_federation_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_federation_tests Thu Apr 21 22:29:16 2016
@@ -37,7 +37,7 @@ sys_test_args = [
]
if XML_LIB is not None:
- module_args = "--load-module {}".format(XML_LIB)
+ module_args = "--load-module {0}".format(XML_LIB)
test_args = None
local_port = start_broker("local", common_args, module_args, "--federation-tag LOCAL")
@@ -46,15 +46,15 @@ remote_b1 = start_broker("remote_b1", co
remote_b2 = start_broker("remote_b2", common_args, module_args, "--federation-tag REMOTE_B2")
run_broker_tests(local_port, "-m federation",
- "-Dremote-port={}".format(remote_port),
- "-Dextra-brokers='{} {}'".format(remote_b1, remote_b2),
+ "-Dremote-port={0}".format(remote_port),
+ "-Dextra-brokers='{0} {1}'".format(remote_b1, remote_b2),
test_args)
-run_broker_tests(local_port, "-m headers_federation", "-Dremote-port={}".format(remote_port))
+run_broker_tests(local_port, "-m headers_federation", "-Dremote-port={0}".format(remote_port))
run_broker_tests(remote_port, "-m federation_sys",
- "-Dlocal-port={}".format(local_port),
- "-Dremote-port={}".format(remote_port),
+ "-Dlocal-port={0}".format(local_port),
+ "-Dremote-port={0}".format(remote_port),
*sys_test_args)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_ha_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_ha_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_ha_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_ha_tests Thu Apr 21 22:29:16 2016
@@ -32,6 +32,6 @@ from common import *
# ENV["QPID_PORT"] = ""
# ENV["QPID_LOG_TO_FILE"] = join(BUILD_DIR, "src", "tests", "gah.log")
-call("qpid-python-test -m ha_tests -DOUTDIR={}", WORK_DIR)
+call("qpid-python-test -m ha_tests -DOUTDIR={0}", WORK_DIR)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_idle_timeout_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_idle_timeout_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_idle_timeout_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_idle_timeout_tests Thu Apr 21 22:29:16 2016
@@ -21,6 +21,6 @@
from common import *
-call("qpid-python-test -m idle_timeout_tests -DOUTDIR={}", WORK_DIR)
+call("qpid-python-test -m idle_timeout_tests -DOUTDIR={0}", WORK_DIR)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_interlink_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_interlink_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_interlink_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_interlink_tests Thu Apr 21 22:29:16 2016
@@ -21,6 +21,6 @@
from common import *
-call("qpid-python-test -m interlink_tests -DOUTDIR={}", WORK_DIR)
+call("qpid-python-test -m interlink_tests -DOUTDIR={0}", WORK_DIR)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_interop_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_interop_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_interop_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_interop_tests Thu Apr 21 22:29:16 2016
@@ -21,10 +21,10 @@
from common import *
-port = start_broker("broker", "--load-module {}".format(AMQP_LIB))
+port = start_broker("broker", "--load-module {0}".format(AMQP_LIB))
-ENV["QPID_INTEROP_URL"] = "localhost:{}".format(port)
+ENV["QPID_INTEROP_URL"] = "localhost:{0}".format(port)
-call("qpid-python-test -m interop_tests -DOUTDIR={}", WORK_DIR)
+call("qpid-python-test -m interop_tests -DOUTDIR={0}", WORK_DIR)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests Thu Apr 21 22:29:16 2016
@@ -24,22 +24,22 @@ from common import *
port = start_broker("broker")
commands = [
- "qpid-config -b {} add queue group-queue --group-header=My-Group-Id --shared-groups",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 3 --ack-frequency 7 --randomize-group-size --interleave 3",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 7 --randomize-group-size",
- "qpid-config -b {} add queue group-queue-two --group-header=My-Group-Id --shared-groups",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 3 --randomize-group-size",
- "msg_group_test -b {} -a group-queue-two --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 3 --ack-frequency 7 --randomize-group-size --interleave 5",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 59 --group-size 5 --receivers 2 --senders 3 --capacity 1 --ack-frequency 3 --randomize-group-size",
- "qpid-config -b {} del queue group-queue-two --force",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 59 --group-size 3 --receivers 2 --senders 3 --capacity 1 --ack-frequency 1 --randomize-group-size",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 211 --group-size 13 --receivers 2 --senders 3 --capacity 47 --ack-frequency 79 --interleave 53",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 10000 --group-size 1 --receivers 0 --senders 1",
- "msg_group_test -b {} -a group-queue --group-key My-Group-Id --messages 10000 --receivers 5 --senders 0",
- "qpid-config -b {} del queue group-queue --force",
+ "qpid-config -b {0} add queue group-queue --group-header=My-Group-Id --shared-groups",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 3 --ack-frequency 7 --randomize-group-size --interleave 3",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 7 --randomize-group-size",
+ "qpid-config -b {0} add queue group-queue-two --group-header=My-Group-Id --shared-groups",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 3 --randomize-group-size",
+ "msg_group_test -b {0} -a group-queue-two --group-key My-Group-Id --messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 3 --ack-frequency 7 --randomize-group-size --interleave 5",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 59 --group-size 5 --receivers 2 --senders 3 --capacity 1 --ack-frequency 3 --randomize-group-size",
+ "qpid-config -b {0} del queue group-queue-two --force",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 59 --group-size 3 --receivers 2 --senders 3 --capacity 1 --ack-frequency 1 --randomize-group-size",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 211 --group-size 13 --receivers 2 --senders 3 --capacity 47 --ack-frequency 79 --interleave 53",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 10000 --group-size 1 --receivers 0 --senders 1",
+ "msg_group_test -b {0} -a group-queue --group-key My-Group-Id --messages 10000 --receivers 5 --senders 0",
+ "qpid-config -b {0} del queue group-queue --force",
]
-address = "localhost:{}".format(port)
+address = "localhost:{0}".format(port)
for command in commands:
call(command, address)
Modified: qpid/trunk/qpid/cpp/src/tests/run_paged_queue_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_paged_queue_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_paged_queue_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_paged_queue_tests Thu Apr 21 22:29:16 2016
@@ -21,25 +21,25 @@
from common import *
-port = start_broker("broker", "--paging-dir={}".format(join(WORK_DIR, "pqtest_data")))
+port = start_broker("broker", "--paging-dir={0}".format(join(WORK_DIR, "pqtest_data")))
messages = 1000
address = "onepage; {create: always, node:{x-declare:{arguments:{'qpid.paging':True,'qpid.max_pages_loaded':1}}}}"
-call_with_valgrind("qpid-send --messages {} --content-size 1024 --broker localhost:{} --address \"{}\"",
+call_with_valgrind("qpid-send --messages {0} --content-size 1024 --broker localhost:{1} --address \"{2}\"",
messages, port, address)
-output = call_for_output_with_valgrind("qpid-receive --address onepage --messages {} --broker localhost:{}",
+output = call_for_output_with_valgrind("qpid-receive --address onepage --messages {0} --broker localhost:{1}",
messages, port)
received = len(output.splitlines())
if received != messages:
- fail("Single page test failed: received {} messages, expected {}", received, messages)
+ fail("Single page test failed: received {0} messages, expected {1}", received, messages)
option = "node:{x-declare:{arguments:{'qpid.paging':True,'qpid.max_size':0,'qpid.max_count':0,'qpid.flow_stop_size':0,'qpid.flow_resume_size':0,'qpid.flow_stop_count':0,'qpid.flow_resume_count':0}}}"
-call("qpid-cpp-benchmark --broker localhost:{} --create-option \"{}\"", port, option)
-call("qpid-cpp-benchmark --broker localhost:{} --create-option \"{}\" --fill-drain", port, option)
+call("qpid-cpp-benchmark --broker localhost:{0} --create-option \"{1}\"", port, option)
+call("qpid-cpp-benchmark --broker localhost:{0} --create-option \"{1}\" --fill-drain", port, option)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_performance_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_performance_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_performance_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_performance_tests Thu Apr 21 22:29:16 2016
@@ -23,6 +23,6 @@ from common import *
port = start_broker("broker")
-call_with_valgrind("qpid-perftest --summary --count 100 --port {}", port)
+call_with_valgrind("qpid-perftest --summary --count 100 --port {0}", port)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_python_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_python_tests Thu Apr 21 22:29:16 2016
@@ -24,10 +24,10 @@ from common import *
load_module_arg = None
if AMQP_LIB is not None:
- load_module_arg = "--load-module {}".format(AMQP_LIB)
+ load_module_arg = "--load-module {0}".format(AMQP_LIB)
acl_file = join(BUILD_DIR, "src", "tests", "policy.acl")
-acl_file_arg = "--acl-file {}".format(acl_file)
+acl_file_arg = "--acl-file {0}".format(acl_file)
port = start_broker("broker", load_module_arg, acl_file_arg)
@@ -46,17 +46,17 @@ run_broker_tests(port,
"-m qpid_tests.broker_0_10.priority",
"-m qpid_tests.broker_0_10.lvq",
"-m qpid_tests.broker_0_10.new_api",
- "-I {}".format(failing_tests))
+ "-I {0}".format(failing_tests))
if AMQP_LIB is not None:
failing_tests = join(BUILD_DIR, "src", "tests", "failing-amqp1.0-python-tests")
run_broker_tests(port,
"--define=\"protocol_version=amqp1.0\"",
- "--define=\"policy_file={}\"".format(acl_file),
+ "--define=\"policy_file={0}\"".format(acl_file),
"-m qpid_tests.broker_1_0",
"-m qpid_tests.broker_0_10.new_api",
"-m assertions -m reject_release -m misc -m policies -m acl_1",
- "-I {}".format(failing_tests))
+ "-I {0}".format(failing_tests))
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_qmf_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_qmf_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_qmf_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_qmf_tests Thu Apr 21 22:29:16 2016
@@ -21,6 +21,6 @@
from common import *
-call("qpid-python-test -m qpidd_qmfv2_tests -DOUTDIR={}", WORK_DIR)
+call("qpid-python-test -m qpidd_qmfv2_tests -DOUTDIR={0}", WORK_DIR)
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_queue_redirect_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_queue_redirect_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_queue_redirect_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_queue_redirect_tests Thu Apr 21 22:29:16 2016
@@ -23,8 +23,8 @@ from common import *
policy_file = join(BUILD_DIR, "src", "tests", "policy.acl")
-port = start_broker("broker", "--acl-file {}".format(policy_file), "--log-enable debug+:Model")
+port = start_broker("broker", "--acl-file {0}".format(policy_file), "--log-enable debug+:Model")
-run_broker_tests(port, "-m queue_redirect", "-Dpolicy-file={}".format(policy_file))
+run_broker_tests(port, "-m queue_redirect", "-Dpolicy-file={0}".format(policy_file))
check_results()
Modified: qpid/trunk/qpid/cpp/src/tests/run_transaction_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_transaction_tests?rev=1740424&r1=1740423&r2=1740424&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_transaction_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_transaction_tests Thu Apr 21 22:29:16 2016
@@ -24,7 +24,7 @@ from common import *
port1 = start_broker("broker1")
port2 = start_broker("broker2")
-call_with_valgrind("qpid-txtest --queues 4 --tx-count 10 --quiet --port {}", port1)
-call_with_valgrind("qpid-txtest2 --queues 4 --tx-count 10 --quiet --port {}", port2)
+call_with_valgrind("qpid-txtest --queues 4 --tx-count 10 --quiet --port {0}", port1)
+call_with_valgrind("qpid-txtest2 --queues 4 --tx-count 10 --quiet --port {0}", port2)
check_results()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org