From 2e29faa768283390452b7d432db28d43cd4a27aa Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Wed, 31 Mar 2010 21:13:12 +0000 Subject: Merged the changes from the qmf-devel0.7a branch back to the trunk. This is a checkpoint along the QMFv2 development path. This update introduces portions of QMFv2 into the code: - The C++ agent (qpid/agent) uses QMFv2 for data and method transfer o The APIs no longer use qpid::framing::* o Consequently, boost is no longer referenced from the API headers. o Agents and Objects are now referenced by strings, not numbers. o Schema transfer still uses the QMFv1 format. - The broker-resident agent can use QMFv1 or QMFv2 based on the command line options. It defaults to QMFv1 for compatibility. - The pure-python QMF console (qmf.console) can concurrently interact with both QMFv1 and QMFv2 agents. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@929716 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/bindings/qmf/tests/python_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/bindings/qmf/tests/python_console.py') diff --git a/cpp/bindings/qmf/tests/python_console.py b/cpp/bindings/qmf/tests/python_console.py index efd25a1d26..883aa8da1a 100755 --- a/cpp/bindings/qmf/tests/python_console.py +++ b/cpp/bindings/qmf/tests/python_console.py @@ -48,7 +48,7 @@ class QmfInteropTests(TestBase010): self.assertEqual(len(parents), 1) parent = parents[0] for seq in range(10): - result = parent.echo(seq) + result = parent.echo(seq, _timeout=5) self.assertEqual(result.status, 0) self.assertEqual(result.text, "OK") self.assertEqual(result.sequence, seq) -- cgit v1.2.1