Author: kwall Date: Fri Nov 9 12:50:57 2012 New Revision: 1407440 URL: http://svn.apache.org/viewvc?rev=1407440&view=rev Log: QPID-4422: removed tabs from the new test
Applied patch from Philip Harvey <[email protected]> Modified: qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py Modified: qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py?rev=1407440&r1=1407439&r2=1407440&view=diff ============================================================================== --- qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py (original) +++ qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py Fri Nov 9 12:50:57 2012 @@ -82,26 +82,26 @@ class BasicTests(TestBase): def test_reconnect_to_durable_subscription(self): try: publisherchannel = self.channel - my_id = "my_id" + my_id = "my_id" consumer_connection_properties_with_instance = {"instance": my_id} queue_for_subscription = "queue_for_subscription_%s" % my_id topic_name = "my_topic_name" test_message = self.uniqueString() - durable_subscription_client = self.connect(client_properties=consumer_connection_properties_with_instance) + durable_subscription_client = self.connect(client_properties=consumer_connection_properties_with_instance) consumerchannel = durable_subscription_client.channel(1) consumerchannel.channel_open() self._declare_and_bind_exclusive_queue_on_topic_exchange(consumerchannel, queue_for_subscription, topic_name) - # disconnect - durable_subscription_client.close() + # disconnect + durable_subscription_client.close() - # send message to topic + # send message to topic publisherchannel.basic_publish(routing_key=topic_name, exchange="amq.topic", content=Content(test_message)) # reconnect and consume message - durable_subscription_client = self.connect(client_properties=consumer_connection_properties_with_instance) + durable_subscription_client = self.connect(client_properties=consumer_connection_properties_with_instance) consumerchannel = durable_subscription_client.channel(1) consumerchannel.channel_open() @@ -112,13 +112,13 @@ class BasicTests(TestBase): subscription = consumerchannel.basic_consume(queue=queue_for_subscription, exclusive=True) queue = durable_subscription_client.queue(subscription.consumer_tag) - # consume and verify message content + # consume and verify message content msg = queue.get(timeout=1) self.assertEqual(test_message, msg.content.body) consumerchannel.basic_ack(delivery_tag=msg.delivery_tag) finally: publisherchannel.queue_delete(queue=queue_for_subscription) - durable_subscription_client.close() + durable_subscription_client.close() def _declare_and_bind_exclusive_queue_on_topic_exchange(self, channel, queue, topic_name): channel.queue_declare(queue=queue, exclusive=True, auto_delete=False, durable=True) @@ -174,7 +174,7 @@ class BasicTests(TestBase): myqueue = self.client.queue("my-consumer") msg = myqueue.get(timeout=1) self.assertEqual("One", msg.content.body) - + #cancel should stop messages being delivered channel.basic_cancel(consumer_tag="my-consumer") channel.basic_publish(routing_key="test-queue-4", content=Content("Two")) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
