diff options
| author | Ted Ross <tross@apache.org> | 2012-06-15 18:35:34 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-06-15 18:35:34 +0000 |
| commit | a46d963ae8e166c84e3980811831f0ca411111cf (patch) | |
| tree | 01939374c69e9909a484bdabf80a71fc91a5a2ea /cpp/src/tests | |
| parent | 91e6c2d1177d6a191c544749807e5e18c303b937 (diff) | |
| download | qpid-python-a46d963ae8e166c84e3980811831f0ca411111cf.tar.gz | |
QPID-4066 - Allow configuration to override the broker's federation tag
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1350732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/federation.py | 3 | ||||
| -rwxr-xr-x | cpp/src/tests/run_federation_tests | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/tests/federation.py b/cpp/src/tests/federation.py index 3b58dce107..d3dfaedaf9 100755 --- a/cpp/src/tests/federation.py +++ b/cpp/src/tests/federation.py @@ -394,6 +394,9 @@ class FederationTests(TestBase010): for i in range(1, 11): try: msg = queue.get(timeout=5) + mp = msg.get("message_properties").application_headers + self.assertEqual(mp.__class__, dict) + self.assertEqual(mp['x-qpid.trace'], 'REMOTE') # check that the federation-tag override works self.assertEqual("Message %d" % i, msg.body) except Empty: self.fail("Failed to find expected message containing 'Message %d'" % i) diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests index 7735b559cf..c2ee550226 100755 --- a/cpp/src/tests/run_federation_tests +++ b/cpp/src/tests/run_federation_tests @@ -36,10 +36,10 @@ fi QPIDD_CMD="../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no --log-enable=info+ --log-enable=debug+:Bridge --log-to-file" start_brokers() { rm -f fed_local.log fed_remote.log fed_b1.log fed_b2.log - LOCAL_PORT=$($QPIDD_CMD fed_local.log) - REMOTE_PORT=$($QPIDD_CMD fed_remote.log) - REMOTE_B1=$($QPIDD_CMD fed_b1.log) - REMOTE_B2=$($QPIDD_CMD fed_b2.log) + 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) + REMOTE_B2=$($QPIDD_CMD fed_b2.log --federation-tag B2) } stop_brokers() { |