From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/testlib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'python/qpid/testlib.py') diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py index f9796982f5..2b283f3998 100644 --- a/python/qpid/testlib.py +++ b/python/qpid/testlib.py @@ -73,7 +73,7 @@ class TestBase(unittest.TestCase): else: self.client.close() - def connect(self, host=None, port=None, user=None, password=None, tune_params=None): + def connect(self, host=None, port=None, user=None, password=None, tune_params=None, client_properties=None): """Create a new connction, return the Client object""" host = host or self.config.broker.host port = port or self.config.broker.port or 5672 @@ -82,9 +82,9 @@ class TestBase(unittest.TestCase): client = qpid.client.Client(host, port) try: if client.spec.major == 8 and client.spec.minor == 0: - client.start({"LOGIN": user, "PASSWORD": password}, tune_params=tune_params) + client.start({"LOGIN": user, "PASSWORD": password}, tune_params=tune_params, client_properties=client_properties) else: - client.start("\x00" + user + "\x00" + password, mechanism="PLAIN", tune_params=tune_params) + client.start("\x00" + user + "\x00" + password, mechanism="PLAIN", tune_params=tune_params, client_properties=client_properties) except qpid.client.Closed, e: if isinstance(e.args[0], VersionError): raise Skipped(e.args[0]) -- cgit v1.2.1