You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2009/03/31 18:02:27 UTC
svn commit: r760500 - in /qpid/branches/0.5-release/qpid/python: ./
commands/ qmf/ qpid/ tests/ tests_0-10/
Author: gsim
Date: Tue Mar 31 16:02:26 2009
New Revision: 760500
URL: http://svn.apache.org/viewvc?rev=760500&view=rev
Log:
Mark large literals explicitly as longs to avoid warnings on earlier versions of python.
Merged from r758389 (but dropped changes to spec010.py from that revision).
Modified:
qpid/branches/0.5-release/qpid/python/commands/qpid-cluster
qpid/branches/0.5-release/qpid/python/commands/qpid-stat
qpid/branches/0.5-release/qpid/python/perftest
qpid/branches/0.5-release/qpid/python/qmf/console.py
qpid/branches/0.5-release/qpid/python/qpid/datatypes.py
qpid/branches/0.5-release/qpid/python/qpid/management.py
qpid/branches/0.5-release/qpid/python/qpid/peer.py
qpid/branches/0.5-release/qpid/python/qpid/testlib.py
qpid/branches/0.5-release/qpid/python/tests/datatypes.py
qpid/branches/0.5-release/qpid/python/tests_0-10/alternate_exchange.py
qpid/branches/0.5-release/qpid/python/tests_0-10/broker.py
qpid/branches/0.5-release/qpid/python/tests_0-10/dtx.py
qpid/branches/0.5-release/qpid/python/tests_0-10/example.py
qpid/branches/0.5-release/qpid/python/tests_0-10/exchange.py
qpid/branches/0.5-release/qpid/python/tests_0-10/management.py
qpid/branches/0.5-release/qpid/python/tests_0-10/message.py
qpid/branches/0.5-release/qpid/python/tests_0-10/persistence.py
qpid/branches/0.5-release/qpid/python/tests_0-10/queue.py
qpid/branches/0.5-release/qpid/python/tests_0-10/tx.py
Modified: qpid/branches/0.5-release/qpid/python/commands/qpid-cluster
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/commands/qpid-cluster?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/commands/qpid-cluster (original)
+++ qpid/branches/0.5-release/qpid/python/commands/qpid-cluster Tue Mar 31 16:02:26 2009
@@ -70,7 +70,7 @@
self.addr = (int(nums[0]) << 24) + (int(nums[1]) << 16) + (int(nums[2]) << 8) + int(nums[3])
def bestAddr(self, addrPortList):
- bestDiff = 0xFFFFFFFF
+ bestDiff = 0xFFFFFFFFL
bestAddr = None
for addrPort in addrPortList:
diff = IpAddr(addrPort[0]).addr ^ self.addr
Modified: qpid/branches/0.5-release/qpid/python/commands/qpid-stat
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/commands/qpid-stat?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/commands/qpid-stat (original)
+++ qpid/branches/0.5-release/qpid/python/commands/qpid-stat Tue Mar 31 16:02:26 2009
@@ -76,7 +76,7 @@
self.addr = (int(nums[0]) << 24) + (int(nums[1]) << 16) + (int(nums[2]) << 8) + int(nums[3])
def bestAddr(self, addrPortList):
- bestDiff = 0xFFFFFFFF
+ bestDiff = 0xFFFFFFFFL
bestAddr = None
for addrPort in addrPortList:
diff = IpAddr(addrPort[0]).addr ^ self.addr
Modified: qpid/branches/0.5-release/qpid/python/perftest
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/perftest?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/perftest (original)
+++ qpid/branches/0.5-release/qpid/python/perftest Tue Mar 31 16:02:26 2009
@@ -44,8 +44,8 @@
consumer = "consumer"
queue = client.queue(consumer)
channel.message_subscribe(queue="sync_queue", destination=consumer)
- channel.message_flow(consumer, 0, 0xFFFFFFFF)
- channel.message_flow(consumer, 1, 0xFFFFFFFF)
+ channel.message_flow(consumer, 0, 0xFFFFFFFFL)
+ channel.message_flow(consumer, 1, 0xFFFFFFFFL)
queue.get(block = True)
print "done"
channel.session_close()
@@ -62,8 +62,8 @@
consumer = "consumer"
queue = client.queue(consumer)
channel.message_subscribe(queue="message_queue", destination=consumer)
- channel.message_flow(consumer, 0, 0xFFFFFFFF)
- channel.message_flow(consumer, 1, 0xFFFFFFFF)
+ channel.message_flow(consumer, 0, 0xFFFFFFFFL)
+ channel.message_flow(consumer, 1, 0xFFFFFFFFL)
final = "That's done"
content = ""
message = None
Modified: qpid/branches/0.5-release/qpid/python/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/qmf/console.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/qmf/console.py (original)
+++ qpid/branches/0.5-release/qpid/python/qmf/console.py Tue Mar 31 16:02:26 2009
@@ -1337,8 +1337,8 @@
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("rdest").listen(self._replyCb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="rdest", flow_mode=1)
- self.amqpSession.message_flow(destination="rdest", unit=0, value=0xFFFFFFFF)
- self.amqpSession.message_flow(destination="rdest", unit=1, value=0xFFFFFFFF)
+ self.amqpSession.message_flow(destination="rdest", unit=0, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="rdest", unit=1, value=0xFFFFFFFFL)
self.topicName = "topic-%s" % self.amqpSessionId
self.amqpSession.queue_declare(queue=self.topicName, exclusive=True, auto_delete=True)
@@ -1347,8 +1347,8 @@
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("tdest").listen(self._replyCb)
self.amqpSession.message_set_flow_mode(destination="tdest", flow_mode=1)
- self.amqpSession.message_flow(destination="tdest", unit=0, value=0xFFFFFFFF)
- self.amqpSession.message_flow(destination="tdest", unit=1, value=0xFFFFFFFF)
+ self.amqpSession.message_flow(destination="tdest", unit=0, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="tdest", unit=1, value=0xFFFFFFFFL)
self.connected = True
self.session._handleBrokerConnect(self)
Modified: qpid/branches/0.5-release/qpid/python/qpid/datatypes.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/qpid/datatypes.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/qpid/datatypes.py (original)
+++ qpid/branches/0.5-release/qpid/python/qpid/datatypes.py Tue Mar 31 16:02:26 2009
@@ -125,7 +125,7 @@
class Serial:
def __init__(self, value):
- self.value = value & 0xFFFFFFFF
+ self.value = value & 0xFFFFFFFFL
def __hash__(self):
return hash(self.value)
@@ -136,8 +136,8 @@
other = serial(other)
- delta = (self.value - other.value) & 0xFFFFFFFF
- neg = delta & 0x80000000
+ delta = (self.value - other.value) & 0xFFFFFFFFL
+ neg = delta & 0x80000000L
mag = delta & 0x7FFFFFFF
if neg:
Modified: qpid/branches/0.5-release/qpid/python/qpid/management.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/qpid/management.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/qpid/management.py (original)
+++ qpid/branches/0.5-release/qpid/python/qpid/management.py Tue Mar 31 16:02:26 2009
@@ -177,12 +177,12 @@
ssn.incoming ("rdest").listen (self.replyCb)
ssn.message_set_flow_mode (destination="tdest", flow_mode=1)
- ssn.message_flow (destination="tdest", unit=0, value=0xFFFFFFFF)
- ssn.message_flow (destination="tdest", unit=1, value=0xFFFFFFFF)
+ ssn.message_flow (destination="tdest", unit=0, value=0xFFFFFFFFL)
+ ssn.message_flow (destination="tdest", unit=1, value=0xFFFFFFFFL)
ssn.message_set_flow_mode (destination="rdest", flow_mode=1)
- ssn.message_flow (destination="rdest", unit=0, value=0xFFFFFFFF)
- ssn.message_flow (destination="rdest", unit=1, value=0xFFFFFFFF)
+ ssn.message_flow (destination="rdest", unit=0, value=0xFFFFFFFFL)
+ ssn.message_flow (destination="rdest", unit=1, value=0xFFFFFFFFL)
def setBrokerInfo (self, data):
self.brokerInfo = data
Modified: qpid/branches/0.5-release/qpid/python/qpid/peer.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/qpid/peer.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/qpid/peer.py (original)
+++ qpid/branches/0.5-release/qpid/python/qpid/peer.py Tue Mar 31 16:02:26 2009
@@ -460,6 +460,6 @@
#TODO: record and manage the ranges properly
range = [mark, mark]
if (self.mark == -1):#hack until wraparound is implemented
- self.channel.execution_complete(cumulative_execution_mark=0xFFFFFFFF, ranged_execution_set=range)
+ self.channel.execution_complete(cumulative_execution_mark=0xFFFFFFFFL, ranged_execution_set=range)
else:
self.channel.execution_complete(cumulative_execution_mark=self.mark, ranged_execution_set=range)
Modified: qpid/branches/0.5-release/qpid/python/qpid/testlib.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/qpid/testlib.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/qpid/testlib.py (original)
+++ qpid/branches/0.5-release/qpid/python/qpid/testlib.py Tue Mar 31 16:02:26 2009
@@ -288,16 +288,16 @@
else: self.uniqueTag += 1
consumer_tag = "tag" + str(self.uniqueTag)
self.channel.message_subscribe(queue=queueName, destination=consumer_tag)
- self.channel.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFF)
- self.channel.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFF)
+ self.channel.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFFL)
+ self.channel.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFFL)
return self.client.queue(consumer_tag)
def subscribe(self, channel=None, **keys):
channel = channel or self.channel
consumer_tag = keys["destination"]
channel.message_subscribe(**keys)
- channel.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFF)
- channel.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFF)
+ channel.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFFL)
+ channel.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFFL)
def assertEmpty(self, queue):
"""Assert that the queue is empty"""
@@ -388,5 +388,5 @@
session = session or self.session
consumer_tag = keys["destination"]
session.message_subscribe(**keys)
- session.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFF)
- session.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFF)
+ session.message_flow(destination=consumer_tag, unit=0, value=0xFFFFFFFFL)
+ session.message_flow(destination=consumer_tag, unit=1, value=0xFFFFFFFFL)
Modified: qpid/branches/0.5-release/qpid/python/tests/datatypes.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests/datatypes.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests/datatypes.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests/datatypes.py Tue Mar 31 16:02:26 2009
@@ -25,16 +25,16 @@
class SerialTest(TestCase):
def test(self):
- for s in (serial(0), serial(0x8FFFFFFF), serial(0xFFFFFFFF)):
+ for s in (serial(0), serial(0x8FFFFFFFL), serial(0xFFFFFFFFL)):
assert s + 1 > s
assert s - 1 < s
assert s < s + 1
assert s > s - 1
- assert serial(0xFFFFFFFF) + 1 == serial(0)
+ assert serial(0xFFFFFFFFL) + 1 == serial(0)
- assert min(serial(0xFFFFFFFF), serial(0x0)) == serial(0xFFFFFFFF)
- assert max(serial(0xFFFFFFFF), serial(0x0)) == serial(0x0)
+ assert min(serial(0xFFFFFFFFL), serial(0x0)) == serial(0xFFFFFFFFL)
+ assert max(serial(0xFFFFFFFFL), serial(0x0)) == serial(0x0)
def testIncr(self):
s = serial(0)
@@ -44,7 +44,7 @@
def testIn(self):
l = [serial(1), serial(2), serial(3), serial(4)]
assert serial(1) in l
- assert serial(0xFFFFFFFF + 2) in l
+ assert serial(0xFFFFFFFFL + 2) in l
assert 4 in l
def testNone(self):
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/alternate_exchange.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/alternate_exchange.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/alternate_exchange.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/alternate_exchange.py Tue Mar 31 16:02:26 2009
@@ -41,16 +41,16 @@
session.queue_declare(queue="returns", exclusive=True, auto_delete=True)
session.exchange_bind(queue="returns", exchange="secondary")
session.message_subscribe(destination="a", queue="returns")
- session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
returned = session.incoming("a")
#declare, bind (to the primary exchange) and consume from a queue for 'processed' messages
session.queue_declare(queue="processed", exclusive=True, auto_delete=True)
session.exchange_bind(queue="processed", exchange="primary", binding_key="my-key")
session.message_subscribe(destination="b", queue="processed")
- session.message_flow(destination="b", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="b", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="b", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="b", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
processed = session.incoming("b")
#publish to the primary exchange
@@ -81,8 +81,8 @@
session.queue_declare(queue="deleted", exclusive=True, auto_delete=True)
session.exchange_bind(exchange="dlq", queue="deleted")
session.message_subscribe(destination="dlq", queue="deleted")
- session.message_flow(destination="dlq", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="dlq", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="dlq", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="dlq", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
dlq = session.incoming("dlq")
#create a queue using the dlq as its alternate exchange:
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/broker.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/broker.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/broker.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/broker.py Tue Mar 31 16:02:26 2009
@@ -36,8 +36,8 @@
# No ack consumer
ctag = "tag1"
session.message_subscribe(queue = "myqueue", destination = ctag)
- session.message_flow(destination=ctag, unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination=ctag, unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination=ctag, unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination=ctag, unit=session.credit_unit.byte, value=0xFFFFFFFFL)
body = "test no-ack"
session.message_transfer(message=Message(session.delivery_properties(routing_key="myqueue"), body))
msg = session.incoming(ctag).get(timeout = 5)
@@ -47,8 +47,8 @@
session.queue_declare(queue = "otherqueue", exclusive=True, auto_delete=True)
ctag = "tag2"
session.message_subscribe(queue = "otherqueue", destination = ctag, accept_mode = 1)
- session.message_flow(destination=ctag, unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination=ctag, unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination=ctag, unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination=ctag, unit=session.credit_unit.byte, value=0xFFFFFFFFL)
body = "test ack"
session.message_transfer(message=Message(session.delivery_properties(routing_key="otherqueue"), body))
msg = session.incoming(ctag).get(timeout = 5)
@@ -64,8 +64,8 @@
session.exchange_bind(queue="test-queue", exchange="amq.fanout")
consumer_tag = "tag1"
session.message_subscribe(queue="test-queue", destination=consumer_tag)
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = consumer_tag)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = consumer_tag)
queue = session.incoming(consumer_tag)
body = "Immediate Delivery"
@@ -86,8 +86,8 @@
consumer_tag = "tag1"
session.message_subscribe(queue="test-queue", destination=consumer_tag)
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = consumer_tag)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = consumer_tag)
queue = session.incoming(consumer_tag)
msg = queue.get(timeout=5)
self.assert_(msg.body == body)
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/dtx.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/dtx.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/dtx.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/dtx.py Tue Mar 31 16:02:26 2009
@@ -575,7 +575,7 @@
session2.dtx_start(xid=tx)
session2.message_subscribe(queue="dummy", destination="dummy")
session2.message_flow(destination="dummy", unit=session2.credit_unit.message, value=1)
- session2.message_flow(destination="dummy", unit=session2.credit_unit.byte, value=0xFFFFFFFF)
+ session2.message_flow(destination="dummy", unit=session2.credit_unit.byte, value=0xFFFFFFFFL)
msg = session2.incoming("dummy").get(timeout=1)
session2.message_accept(RangedSet(msg.id))
session2.message_cancel(destination="dummy")
@@ -736,7 +736,7 @@
#consume from src:
session.message_subscribe(destination="temp-swap", queue=src)
session.message_flow(destination="temp-swap", unit=session.credit_unit.message, value=1)
- session.message_flow(destination="temp-swap", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="temp-swap", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
msg = session.incoming("temp-swap").get(timeout=1)
session.message_cancel(destination="temp-swap")
session.message_accept(RangedSet(msg.id))
@@ -753,7 +753,7 @@
def assertMessageId(self, expected, queue):
self.session.message_subscribe(queue=queue, destination="results")
self.session.message_flow(destination="results", unit=self.session.credit_unit.message, value=1)
- self.session.message_flow(destination="results", unit=self.session.credit_unit.byte, value=0xFFFFFFFF)
+ self.session.message_flow(destination="results", unit=self.session.credit_unit.byte, value=0xFFFFFFFFL)
self.assertEqual(expected, self.getMessageProperty(self.session.incoming("results").get(timeout=1), 'correlation_id'))
self.session.message_cancel(destination="results")
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/example.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/example.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/example.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/example.py Tue Mar 31 16:02:26 2009
@@ -69,8 +69,8 @@
# field that is filled if the reply includes content. In this case the
# interesting field is the consumer_tag.
session.message_subscribe(queue="test-queue", destination="consumer_tag")
- session.message_flow(destination="consumer_tag", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="consumer_tag", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="consumer_tag", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="consumer_tag", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
# We can use the session.incoming(...) method to access the messages
# delivered for our consumer_tag.
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/exchange.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/exchange.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/exchange.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/exchange.py Tue Mar 31 16:02:26 2009
@@ -108,8 +108,8 @@
else: self.uniqueTag += 1
consumer_tag = "tag" + str(self.uniqueTag)
self.session.message_subscribe(queue=queueName, destination=consumer_tag)
- self.session.message_flow(destination=consumer_tag, unit=self.session.credit_unit.message, value=0xFFFFFFFF)
- self.session.message_flow(destination=consumer_tag, unit=self.session.credit_unit.byte, value=0xFFFFFFFF)
+ self.session.message_flow(destination=consumer_tag, unit=self.session.credit_unit.message, value=0xFFFFFFFFL)
+ self.session.message_flow(destination=consumer_tag, unit=self.session.credit_unit.byte, value=0xFFFFFFFFL)
return self.session.incoming(consumer_tag)
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/management.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/management.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/management.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/management.py Tue Mar 31 16:02:26 2009
@@ -192,8 +192,8 @@
"Consume the messages of the queue and check they are all there in order"
session.message_subscribe(queue="src-queue", destination="tag")
- session.message_flow(destination="tag", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="tag", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="tag", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="tag", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("tag")
for count in twenty:
consumed_msg = queue.get(timeout=1)
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/message.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/message.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/message.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/message.py Tue Mar 31 16:02:26 2009
@@ -230,8 +230,8 @@
session.message_subscribe(destination="my-consumer", queue="test-queue-4")
myqueue = session.incoming("my-consumer")
- session.message_flow(destination="my-consumer", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="my-consumer", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="my-consumer", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="my-consumer", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
#should flush here
@@ -258,8 +258,8 @@
session.queue_declare(queue="test-ack-queue", auto_delete=True)
session.message_subscribe(queue = "test-ack-queue", destination = "consumer")
- session.message_flow(destination="consumer", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="consumer", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="consumer", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="consumer", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("consumer")
delivery_properties = session.delivery_properties(routing_key="test-ack-queue")
@@ -289,8 +289,8 @@
session.close(timeout=10)
session = self.session
- session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("checker")
msg3b = queue.get(timeout=1)
@@ -311,16 +311,16 @@
session.exchange_bind(queue = "r", exchange = "amq.fanout")
session.message_subscribe(queue = "q", destination = "consumer")
- session.message_flow(destination="consumer", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="consumer", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="consumer", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="consumer", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"), "blah, blah"))
msg = session.incoming("consumer").get(timeout = 1)
self.assertEquals(msg.body, "blah, blah")
session.message_reject(RangedSet(msg.id))
session.message_subscribe(queue = "r", destination = "checker")
- session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
msg = session.incoming("checker").get(timeout = 1)
self.assertEquals(msg.body, "blah, blah")
@@ -341,7 +341,7 @@
#set message credit to finite amount (less than enough for all messages)
session.message_flow(unit = session.credit_unit.message, value = 5, destination = "c")
#set infinite byte credit
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "c")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "c")
#check that expected number were received
q = session.incoming("c")
for i in range(1, 6):
@@ -374,7 +374,7 @@
#set byte credit to finite amount (less than enough for all messages)
session.message_flow(unit = session.credit_unit.byte, value = msg_size*5, destination = "c")
#set infinite message credit
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = "c")
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = "c")
#check that expected number were received
q = session.incoming("c")
for i in range(5):
@@ -405,7 +405,7 @@
#set message credit to finite amount (less than enough for all messages)
session.message_flow(unit = session.credit_unit.message, value = 5, destination = "c")
#set infinite byte credit
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "c")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "c")
#check that expected number were received
q = session.incoming("c")
for i in range(1, 6):
@@ -443,7 +443,7 @@
#set byte credit to finite amount (less than enough for all messages)
session.message_flow(unit = session.credit_unit.byte, value = msg_size*5, destination = "c")
#set infinite message credit
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = "c")
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = "c")
#check that expected number were received
q = session.incoming("c")
msgs = []
@@ -508,11 +508,11 @@
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"), "Message %s" % i))
session.message_subscribe(queue = "q", destination = "a", acquire_mode = 1)
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = "a")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
session.message_subscribe(queue = "q", destination = "b", acquire_mode = 1)
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = "b")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "b")
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = "b")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "b")
for i in range(6, 11):
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"), "Message %s" % i))
@@ -544,8 +544,8 @@
session.message_subscribe(queue = "q", destination = "a", acquire_mode = 1, accept_mode = 1)
session.message_set_flow_mode(flow_mode = session.flow_mode.credit, destination = "a")
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = "a")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
msg = session.incoming("a").get(timeout = 1)
self.assertEquals("acquire me", msg.body)
#message should still be on the queue:
@@ -568,8 +568,8 @@
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"), "acquire me"))
session.message_subscribe(queue = "q", destination = "a", acquire_mode = 1)
- session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
msg = session.incoming("a").get(timeout = 1)
self.assertEquals("acquire me", msg.body)
#message should still be on the queue:
@@ -594,8 +594,8 @@
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"), "release me"))
session.message_subscribe(queue = "q", destination = "a")
- session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="a", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="a", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
msg = session.incoming("a").get(timeout = 1)
self.assertEquals("release me", msg.body)
session.message_cancel(destination = "a")
@@ -615,7 +615,7 @@
session.message_subscribe(queue = "q", destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "a")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
queue = session.incoming("a")
first = queue.get(timeout = 1)
for i in range(2, 10):
@@ -648,7 +648,7 @@
session.message_subscribe(queue = "q", destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "a")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
queue = session.incoming("a")
ids = []
for i in range (1, 11):
@@ -673,8 +673,8 @@
session.close(timeout=10)
session = self.session
- session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="checker", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="checker", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("checker")
self.assertEquals("message 4", queue.get(timeout = 1).body)
@@ -692,7 +692,7 @@
session.message_subscribe(queue = "q", destination = "a")
session.message_set_flow_mode(flow_mode = 0, destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 5, destination = "a")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
queue = session.incoming("a")
for i in range(1, 6):
@@ -707,7 +707,7 @@
#now create a not-acquired subscriber
session.message_subscribe(queue = "q", destination = "b", acquire_mode=1)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "b")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "b")
#check it gets those not consumed
queue = session.incoming("b")
@@ -735,7 +735,7 @@
#create a not-acquired subscriber
session.message_subscribe(queue = "q", destination = "a", acquire_mode=1)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "a")
#browse through messages
@@ -757,7 +757,7 @@
#create a second not-acquired subscriber
session.message_subscribe(queue = "q", destination = "b", acquire_mode=1)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "b")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "b")
session.message_flow(unit = session.credit_unit.message, value = 1, destination = "b")
#check it gets those not consumed
queue = session.incoming("b")
@@ -784,12 +784,12 @@
#create two 'browsers'
session.message_subscribe(queue = "q", destination = "a", acquire_mode=1)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "a")
queueA = session.incoming("a")
session.message_subscribe(queue = "q", destination = "b", acquire_mode=1)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "b")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "b")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "b")
queueB = session.incoming("b")
@@ -806,7 +806,7 @@
#create consumer
session.message_subscribe(queue = "q", destination = "c")
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "c")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "c")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "c")
queueC = session.incoming("c")
#consume the message then ack it
@@ -823,8 +823,8 @@
consumer_tag = "tag1"
session.message_subscribe(queue="xyz", destination=consumer_tag)
- session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFF, destination = consumer_tag)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.message, value = 0xFFFFFFFFL, destination = consumer_tag)
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = consumer_tag)
queue = session.incoming(consumer_tag)
msg = queue.get(timeout=1)
self.assertEquals("", msg.body)
@@ -863,7 +863,7 @@
messages = session.incoming(d)
sleep(1)
session.message_flow(unit = session.credit_unit.message, value=2, destination=d)
- session.message_flow(unit = session.credit_unit.byte, value=0xFFFFFFFF, destination=d)
+ session.message_flow(unit = session.credit_unit.byte, value=0xFFFFFFFFL, destination=d)
assert messages.get(timeout=1).body == "second"
self.assertEmpty(messages)
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/persistence.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/persistence.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/persistence.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/persistence.py Tue Mar 31 16:02:26 2009
@@ -49,7 +49,7 @@
#create consumer
session.message_subscribe(queue = "q", destination = "a", accept_mode = 1, acquire_mode=0)
- session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFF, destination = "a")
+ session.message_flow(unit = session.credit_unit.byte, value = 0xFFFFFFFFL, destination = "a")
session.message_flow(unit = session.credit_unit.message, value = 10, destination = "a")
queue = session.incoming("a")
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/queue.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/queue.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/queue.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/queue.py Tue Mar 31 16:02:26 2009
@@ -49,8 +49,8 @@
#send a further message and consume it, ensuring that the other messages are really gone
session.message_transfer(message=Message(session.delivery_properties(routing_key="test-queue"), "four"))
session.message_subscribe(queue="test-queue", destination="tag")
- session.message_flow(destination="tag", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="tag", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="tag", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="tag", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("tag")
msg = queue.get(timeout=1)
self.assertEqual("four", msg.body)
@@ -182,11 +182,11 @@
session.queue_declare(queue="queue-2", exclusive=True, auto_delete=True)
session.message_subscribe(queue="queue-1", destination="queue-1")
- session.message_flow(destination="queue-1", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="queue-1", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="queue-1", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="queue-1", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
session.message_subscribe(queue="queue-2", destination="queue-2")
- session.message_flow(destination="queue-2", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="queue-2", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="queue-2", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="queue-2", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue1 = session.incoming("queue-1")
queue2 = session.incoming("queue-2")
@@ -283,8 +283,8 @@
#empty queue:
session.message_subscribe(destination="consumer_tag", queue="delete-me-2")
- session.message_flow(destination="consumer_tag", unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination="consumer_tag", unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination="consumer_tag", unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination="consumer_tag", unit=session.credit_unit.byte, value=0xFFFFFFFFL)
queue = session.incoming("consumer_tag")
msg = queue.get(timeout=1)
self.assertEqual("message", msg.body)
Modified: qpid/branches/0.5-release/qpid/python/tests_0-10/tx.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/python/tests_0-10/tx.py?rev=760500&r1=760499&r2=760500&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/python/tests_0-10/tx.py (original)
+++ qpid/branches/0.5-release/qpid/python/tests_0-10/tx.py Tue Mar 31 16:02:26 2009
@@ -251,13 +251,13 @@
session = session or self.session
consumer_tag = keys["destination"]
session.message_subscribe(**keys)
- session.message_flow(destination=consumer_tag, unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination=consumer_tag, unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination=consumer_tag, unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination=consumer_tag, unit=session.credit_unit.byte, value=0xFFFFFFFFL)
def enable_flow(self, tag, session=None):
session = session or self.session
- session.message_flow(destination=tag, unit=session.credit_unit.message, value=0xFFFFFFFF)
- session.message_flow(destination=tag, unit=session.credit_unit.byte, value=0xFFFFFFFF)
+ session.message_flow(destination=tag, unit=session.credit_unit.message, value=0xFFFFFFFFL)
+ session.message_flow(destination=tag, unit=session.credit_unit.byte, value=0xFFFFFFFFL)
def complete(self, session, msg):
session.receiver._completed.add(msg.id)#TODO: this may be done automatically
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org