diff options
Diffstat (limited to 'python/tests_0-8')
| -rw-r--r-- | python/tests_0-8/__init__.py | 2 | ||||
| -rw-r--r-- | python/tests_0-8/basic.py | 7 | ||||
| -rw-r--r-- | python/tests_0-8/broker.py | 24 | ||||
| -rw-r--r-- | python/tests_0-8/example.py | 2 | ||||
| -rw-r--r-- | python/tests_0-8/queue.py | 2 | ||||
| -rw-r--r-- | python/tests_0-8/testlib.py | 2 | ||||
| -rw-r--r-- | python/tests_0-8/tx.py | 2 |
7 files changed, 30 insertions, 11 deletions
diff --git a/python/tests_0-8/__init__.py b/python/tests_0-8/__init__.py index 9a09d2d04f..526f2452f8 100644 --- a/python/tests_0-8/__init__.py +++ b/python/tests_0-8/__init__.py @@ -18,3 +18,5 @@ # specific language governing permissions and limitations # under the License. # + +import basic, broker, example, exchange, queue, testlib, tx diff --git a/python/tests_0-8/basic.py b/python/tests_0-8/basic.py index 95ca0d7287..d5837fc19c 100644 --- a/python/tests_0-8/basic.py +++ b/python/tests_0-8/basic.py @@ -19,7 +19,7 @@ from qpid.client import Client, Closed from qpid.queue import Empty from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase class BasicTests(TestBase): """Tests for 'methods' on the amqp basic 'class'""" @@ -219,10 +219,11 @@ class BasicTests(TestBase): channel.basic_ack(delivery_tag=msg4.delivery_tag, multiple=False) #Four channel.basic_cancel(consumer_tag=subscription.consumer_tag) - subscription2 = channel.basic_consume(queue="test-requeue") - queue2 = self.client.queue(subscription2.consumer_tag) channel.basic_recover(requeue=True) + + subscription2 = channel.basic_consume(queue="test-requeue") + queue2 = self.client.queue(subscription2.consumer_tag) msg3b = queue2.get(timeout=1) msg5b = queue2.get(timeout=1) diff --git a/python/tests_0-8/broker.py b/python/tests_0-8/broker.py index d9ac69c5e3..7f3fe7530e 100644 --- a/python/tests_0-8/broker.py +++ b/python/tests_0-8/broker.py @@ -19,15 +19,15 @@ from qpid.client import Closed from qpid.queue import Empty from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase class BrokerTests(TestBase): """Tests for basic Broker functionality""" - def test_amqp_basic_13(self): + def test_ack_and_no_ack(self): """ First, this test tries to receive a message with a no-ack - consumer. Second, this test tries to explicitely receive and + consumer. Second, this test tries to explicitly receive and acknowledge a message with an acknowledging consumer. """ ch = self.channel @@ -40,7 +40,7 @@ class BrokerTests(TestBase): msg = self.client.queue(ctag).get(timeout = 5) self.assert_(msg.content.body == body) - # Acknowleding consumer + # Acknowledging consumer self.queue_declare(ch, queue = "otherqueue") ctag = ch.basic_consume(queue = "otherqueue", no_ack = False).consumer_tag body = "test ack" @@ -102,3 +102,19 @@ class BrokerTests(TestBase): except Closed, e: self.assertConnectionException(504, e.args[0]) + def test_channel_flow(self): + channel = self.channel + channel.queue_declare(queue="flow_test_queue", exclusive=True) + ctag = channel.basic_consume(queue="flow_test_queue", no_ack=True).consumer_tag + incoming = self.client.queue(ctag) + + channel.channel_flow(active=False) + channel.basic_publish(routing_key="flow_test_queue", content=Content("abcdefghijklmnopqrstuvwxyz")) + try: + incoming.get(timeout=1) + self.fail("Received message when flow turned off.") + except Empty: None + + channel.channel_flow(active=True) + msg = incoming.get(timeout=1) + self.assertEqual("abcdefghijklmnopqrstuvwxyz", msg.content.body) diff --git a/python/tests_0-8/example.py b/python/tests_0-8/example.py index a1949ccb9f..d82bad1f61 100644 --- a/python/tests_0-8/example.py +++ b/python/tests_0-8/example.py @@ -18,7 +18,7 @@ # from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase class ExampleTest (TestBase): """ diff --git a/python/tests_0-8/queue.py b/python/tests_0-8/queue.py index 60ac4c3dfb..b7a41736ab 100644 --- a/python/tests_0-8/queue.py +++ b/python/tests_0-8/queue.py @@ -19,7 +19,7 @@ from qpid.client import Client, Closed from qpid.queue import Empty from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase class QueueTests(TestBase): """Tests for 'methods' on the amqp queue 'class'""" diff --git a/python/tests_0-8/testlib.py b/python/tests_0-8/testlib.py index cab07cc4ac..76f7e964a2 100644 --- a/python/tests_0-8/testlib.py +++ b/python/tests_0-8/testlib.py @@ -22,7 +22,7 @@ # from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase from Queue import Empty import sys diff --git a/python/tests_0-8/tx.py b/python/tests_0-8/tx.py index 054fb8d8b7..9faddb1110 100644 --- a/python/tests_0-8/tx.py +++ b/python/tests_0-8/tx.py @@ -19,7 +19,7 @@ from qpid.client import Client, Closed from qpid.queue import Empty from qpid.content import Content -from qpid.testlib import testrunner, TestBase +from qpid.testlib import TestBase class TxTests(TestBase): """ |