Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to sqs encoding. Closes #4.

Browse Source
This commit is contained in:
Steve Pulec 2013-03-23 09:44:53 -04:00
parent a53f5c6730
commit b03d48e6bc
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/sqs/models.py
View File

@ -1,4 +1,3 @@
import base64
import md5 import md5
from moto.core import BaseBackend from moto.core import BaseBackend
@ -9,7 +8,7 @@ from .utils import generate_receipt_handle
class Message(object): class Message(object):
def __init__(self, message_id, body): def __init__(self, message_id, body):
self.id = message_id self.id = message_id
self._body = body self.body = body
self.receipt_handle = generate_receipt_handle() self.receipt_handle = generate_receipt_handle()
@property @property
@ -18,11 +17,6 @@ class Message(object):
body_md5.update(self.body) body_md5.update(self.body)
return body_md5.hexdigest() return body_md5.hexdigest()
@property
def body(self):
# SQS Message bodies are base64 encoded by default
return base64.b64encode(self._body)
class Queue(object): class Queue(object):
camelcase_attributes = ['VisibilityTimeout', 'ApproximateNumberOfMessages'] camelcase_attributes = ['VisibilityTimeout', 'ApproximateNumberOfMessages']

5
tests/test_sqs/test_server.py
View File

@ -1,4 +1,3 @@
import base64
import re import re
import sure # flake8: noqa import sure # flake8: noqa
@ -10,7 +9,7 @@ Test the different server responses
server.configure_urls("sqs") server.configure_urls("sqs")
def test_ses_list_identities(): def test_sqs_list_identities():
test_client = server.app.test_client() test_client = server.app.test_client()
res = test_client.get('/?Action=ListQueues') res = test_client.get('/?Action=ListQueues')
res.data.should.contain("ListQueuesResponse") res.data.should.contain("ListQueuesResponse")
@ -23,4 +22,4 @@ def test_ses_list_identities():
res = test_client.get( res = test_client.get(
'/123/testqueue?Action=ReceiveMessage&MaxNumberOfMessages=1') '/123/testqueue?Action=ReceiveMessage&MaxNumberOfMessages=1')
message = re.search("<Body>(.*?)</Body>", res.data).groups()[0] message = re.search("<Body>(.*?)</Body>", res.data).groups()[0]
base64.decodestring(message).should.equal('test-message') message.should.equal('test-message')

15
tests/test_sqs/test_sqs.py
View File

@ -1,5 +1,6 @@
import boto import boto
from boto.exception import SQSError from boto.exception import SQSError
from boto.sqs.message import RawMessage
import requests import requests
import sure # flake8: noqa import sure # flake8: noqa
@ -55,6 +56,15 @@ def test_send_message():
messages[0].get_body().should.equal('this is a test message') messages[0].get_body().should.equal('this is a test message')
@mock_sqs
def test_read_message_from_queue():
conn = boto.connect_sqs()
queue = conn.create_queue('testqueue')
queue.write(queue.new_message('foo bar baz'))
message = queue.read(1)
message.get_body().should.equal('foo bar baz')
@mock_sqs @mock_sqs
def test_queue_length(): def test_queue_length():
conn = boto.connect_sqs('the_key', 'the_secret') conn = boto.connect_sqs('the_key', 'the_secret')
@ -84,7 +94,10 @@ def test_send_batch_operation():
conn = boto.connect_sqs('the_key', 'the_secret') conn = boto.connect_sqs('the_key', 'the_secret')
queue = conn.create_queue("test-queue", visibility_timeout=60) queue = conn.create_queue("test-queue", visibility_timeout=60)
conn.send_message_batch(queue, [ # See https://github.com/boto/boto/issues/831
queue.set_message_class(RawMessage)
queue.write_batch([
("my_first_message", 'test message 1', 0), ("my_first_message", 'test message 1', 0),
("my_second_message", 'test message 2', 0), ("my_second_message", 'test message 2', 0),
("my_third_message", 'test message 3', 0), ("my_third_message", 'test message 3', 0),