qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject qpid-python git commit: QPID-7423: Fix identation problem introduced by last commit (5c237dc)
Date Mon, 12 Sep 2016 08:14:19 GMT
Repository: qpid-python
Updated Branches:
  refs/heads/master 5c237dc3c -> 7400f6ede


QPID-7423: Fix identation problem introduced by last commit (5c237dc)


Project: http://git-wip-us.apache.org/repos/asf/qpid-python/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-python/commit/7400f6ed
Tree: http://git-wip-us.apache.org/repos/asf/qpid-python/tree/7400f6ed
Diff: http://git-wip-us.apache.org/repos/asf/qpid-python/diff/7400f6ed

Branch: refs/heads/master
Commit: 7400f6ede3389071a60100703925155655e7baeb
Parents: 5c237dc
Author: Keith Wall <kwall@apache.org>
Authored: Mon Sep 12 09:12:41 2016 +0100
Committer: Keith Wall <kwall@apache.org>
Committed: Mon Sep 12 09:13:28 2016 +0100

----------------------------------------------------------------------
 qpid_tests/broker_0_9/echo.py | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-python/blob/7400f6ed/qpid_tests/broker_0_9/echo.py
----------------------------------------------------------------------
diff --git a/qpid_tests/broker_0_9/echo.py b/qpid_tests/broker_0_9/echo.py
index b93a094..ff11f3d 100644
--- a/qpid_tests/broker_0_9/echo.py
+++ b/qpid_tests/broker_0_9/echo.py
@@ -64,46 +64,46 @@ class EchoTests(TestBase):
     self.assertEqual(len(body), len(msg.content.body))
     self.assertEqual(body, msg.content.body)
 
-    def test_large_message_received_in_many_content_frames(self):
-      if self.client.conn.FRAME_MIN_SIZE == self.frame_max_size:
-        raise Skipped("Test requires that frame_max_size (%d) exceeds frame_min_size (%d)"
% (self.frame_max_size, self.frame_max_size))
+  def test_large_message_received_in_many_content_frames(self):
+    if self.client.conn.FRAME_MIN_SIZE == self.frame_max_size:
+      raise Skipped("Test requires that frame_max_size (%d) exceeds frame_min_size (%d)"
% (self.frame_max_size, self.frame_max_size))
 
-      channel = self.channel
+    channel = self.channel
 
-      queue_name = "q"
-      self.queue_declare(queue=queue_name)
+    queue_name = "q"
+    self.queue_declare(queue=queue_name)
 
-      channel.tx_select()
+    channel.tx_select()
 
-      body = self.randomLongString()
-      channel.basic_publish(
-        content=Content(body),
-        routing_key=queue_name)
-      channel.tx_commit()
+    body = self.randomLongString()
+    channel.basic_publish(
+      content=Content(body),
+      routing_key=queue_name)
+    channel.tx_commit()
 
-      consuming_client = None
-      try:
-        # Create a second connection with minimum framesize.  The Broker will then be forced
to chunk
-        # the content in order to send it to us.
-        consuming_client = qpid.client.Client(self.config.broker.host, self.config.broker.port)
-        tune_params = { "frame_max" : self.client.conn.FRAME_MIN_SIZE }
-        consuming_client.start(username = self.config.broker.user, password = self.config.broker.password,
tune_params = tune_params)
-
-        consuming_channel = consuming_client.channel(1)
-        consuming_channel.channel_open()
-        consuming_channel.tx_select()
-
-        consumer_reply = consuming_channel.basic_consume(queue=queue_name, no_ack=False)
-        consumer = consuming_client.queue(consumer_reply.consumer_tag)
-        msg = consumer.get(timeout=1)
-        consuming_channel.basic_ack(delivery_tag=msg.delivery_tag)
-        consuming_channel.tx_commit()
-
-        self.assertEqual(len(body), len(msg.content.body))
-        self.assertEqual(body, msg.content.body)
-      finally:
-        if consuming_client:
-          consuming_client.close()
+    consuming_client = None
+    try:
+      # Create a second connection with minimum framesize.  The Broker will then be forced
to chunk
+      # the content in order to send it to us.
+      consuming_client = qpid.client.Client(self.config.broker.host, self.config.broker.port)
+      tune_params = { "frame_max" : self.client.conn.FRAME_MIN_SIZE }
+      consuming_client.start(username = self.config.broker.user, password = self.config.broker.password,
tune_params = tune_params)
+
+      consuming_channel = consuming_client.channel(1)
+      consuming_channel.channel_open()
+      consuming_channel.tx_select()
+
+      consumer_reply = consuming_channel.basic_consume(queue=queue_name, no_ack=False)
+      consumer = consuming_client.queue(consumer_reply.consumer_tag)
+      msg = consumer.get(timeout=1)
+      consuming_channel.basic_ack(delivery_tag=msg.delivery_tag)
+      consuming_channel.tx_commit()
+
+      self.assertEqual(len(body), len(msg.content.body))
+      self.assertEqual(body, msg.content.body)
+    finally:
+      if consuming_client:
+        consuming_client.close()
 
     def test_commit_ok_possibly_interleaved_with_message_delivery(self):
       """This test exposes an defect on the Java Broker (QPID-6094).  The Java Broker (0.32
and below)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message