summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris <henry.christopher@gmail.com>2014-08-09 18:28:28 -0700
committerChris <henry.christopher@gmail.com>2014-08-09 18:28:28 -0700
commit274cf287c7233d2c35e51cfc0ee43c2627ec4ab5 (patch)
tree870444890bed7ded7f6d9be071f5e4bad77dddfe
parentea9b6b5a10a219077d32ec49d6c151af200729f2 (diff)
downloadboto-274cf287c7233d2c35e51cfc0ee43c2627ec4ab5.tar.gz
Add nose tags to SQS tests.
-rw-r--r--tests/unit/sqs/test_connection.py18
-rw-r--r--tests/unit/sqs/test_message.py11
-rw-r--r--tests/unit/sqs/test_queue.py4
3 files changed, 25 insertions, 8 deletions
diff --git a/tests/unit/sqs/test_connection.py b/tests/unit/sqs/test_connection.py
index 62dce12b..6d7eac85 100644
--- a/tests/unit/sqs/test_connection.py
+++ b/tests/unit/sqs/test_connection.py
@@ -30,6 +30,7 @@ from boto.sqs.regioninfo import SQSRegionInfo
from boto.sqs.message import RawMessage
from boto.sqs.queue import Queue
+from nose.plugins.attrib import attr
class SQSAuthParams(AWSMockServiceTestCase):
connection_class = SQSConnection
@@ -50,6 +51,7 @@ class SQSAuthParams(AWSMockServiceTestCase):
</ResponseMetadata>
</CreateQueueResponse>"""
+ @attr(sqs=True)
def test_auth_service_name_override(self):
self.set_http_response(status_code=200)
# We can use the auth_service_name to change what service
@@ -61,6 +63,7 @@ class SQSAuthParams(AWSMockServiceTestCase):
self.assertIn('us-east-1/service_override/aws4_request',
self.actual_request.headers['Authorization'])
+ @attr(sqs=True)
def test_class_attribute_can_set_service_name(self):
self.set_http_response(status_code=200)
# The SQS class has an 'AuthServiceName' param of 'sqs':
@@ -72,6 +75,7 @@ class SQSAuthParams(AWSMockServiceTestCase):
self.assertIn('us-east-1/sqs/aws4_request',
self.actual_request.headers['Authorization'])
+ @attr(sqs=True)
def test_auth_region_name_is_automatically_updated(self):
region = SQSRegionInfo(name='us-west-2',
endpoint='us-west-2.queue.amazonaws.com')
@@ -84,12 +88,12 @@ class SQSAuthParams(AWSMockServiceTestCase):
self.set_http_response(status_code=200)
self.service_connection.create_queue('my_queue')
-
+
# Note the region name below is 'us-west-2'.
self.assertIn('us-west-2/sqs/aws4_request',
self.actual_request.headers['Authorization'])
-
-
+
+ @attr(sqs=True)
def test_set_get_auth_service_and_region_names(self):
self.service_connection.auth_service_name = 'service_name'
self.service_connection.auth_region_name = 'region_name'
@@ -98,11 +102,12 @@ class SQSAuthParams(AWSMockServiceTestCase):
'service_name')
self.assertEqual(self.service_connection.auth_region_name, 'region_name')
+ @attr(sqs=True)
def test_get_queue_with_owner_account_id_returns_queue(self):
-
+
self.set_http_response(status_code=200)
self.service_connection.create_queue('my_queue')
-
+
self.service_connection.get_queue('my_queue', '599169622985')
assert 'QueueOwnerAWSAccountId' in self.actual_request.params.keys()
@@ -143,6 +148,7 @@ class SQSMessageAttributesParsing(AWSMockServiceTestCase):
</ResponseMetadata>
</ReceiveMessageResponse>"""
+ @attr(sqs=True)
def test_message_attribute_response(self):
self.set_http_response(status_code=200)
@@ -187,6 +193,7 @@ class SQSSendMessageAttributes(AWSMockServiceTestCase):
</SendMessageResponse>
"""
+ @attr(sqs=True)
def test_send_message_attributes(self):
self.set_http_response(status_code=200)
@@ -242,6 +249,7 @@ class SQSSendBatchMessageAttributes(AWSMockServiceTestCase):
</SendMessageBatchResponse>
"""
+ @attr(sqs=True)
def test_send_message_attributes(self):
self.set_http_response(status_code=200)
diff --git a/tests/unit/sqs/test_message.py b/tests/unit/sqs/test_message.py
index 337460f1..cc63cfa1 100644
--- a/tests/unit/sqs/test_message.py
+++ b/tests/unit/sqs/test_message.py
@@ -26,8 +26,11 @@ from boto.sqs.message import RawMessage
from boto.sqs.bigmessage import BigMessage
from boto.exception import SQSDecodeError
+from nose.plugins.attrib import attr
class TestMHMessage(unittest.TestCase):
+
+ @attr(sqs=True)
def test_contains(self):
msg = MHMessage()
msg.update({'hello': 'world'})
@@ -35,11 +38,14 @@ class TestMHMessage(unittest.TestCase):
class DecodeExceptionRaisingMessage(RawMessage):
+
+ @attr(sqs=True)
def decode(self, message):
raise SQSDecodeError('Sample decode error', self)
class TestEncodeMessage(unittest.TestCase):
+ @attr(sqs=True)
def test_message_id_available(self):
import xml.sax
from boto.resultset import ResultSet
@@ -65,7 +71,8 @@ class TestEncodeMessage(unittest.TestCase):
class TestBigMessage(unittest.TestCase):
-
+
+ @attr(sqs=True)
def test_s3url_parsing(self):
msg = BigMessage()
# Try just a bucket name
@@ -89,6 +96,6 @@ class TestBigMessage(unittest.TestCase):
bucket, key = msg._get_bucket_key('foo/bar')
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/unit/sqs/test_queue.py b/tests/unit/sqs/test_queue.py
index b903cbf7..63ac308e 100644
--- a/tests/unit/sqs/test_queue.py
+++ b/tests/unit/sqs/test_queue.py
@@ -24,9 +24,11 @@ from mock import Mock
from boto.sqs.queue import Queue
+from nose.plugins.attrib import attr
class TestQueue(unittest.TestCase):
+ @attr(sqs=True)
def test_queue_arn(self):
connection = Mock()
connection.region.name = 'us-east-1'
@@ -35,7 +37,7 @@ class TestQueue(unittest.TestCase):
url='https://sqs.us-east-1.amazonaws.com/id/queuename')
self.assertEqual(q.arn, 'arn:aws:sqs:us-east-1:id:queuename')
-
+ @attr(sqs=True)
def test_queue_name(self):
connection = Mock()
connection.region.name = 'us-east-1'