Merging in latest boto.

boto/tests/test_sqsconnection.py

Index: boto/tests/test_sqsconnection.py
diff --git a/boto/tests/test_sqsconnection.py b/boto/tests/test_sqsconnection.py
deleted file mode 100644
index dd0cfcc8fcd79a142d53c847c249f68ae99ec0a4..0000000000000000000000000000000000000000
--- a/boto/tests/test_sqsconnection.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2006-2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2010, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish, dis-
-# tribute, sublicense, and/or sell copies of the Software, and to permit
-# persons to whom the Software is furnished to do so, subject to the fol-
-# lowing conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Some unit tests for the SQSConnection
-"""
-
-import unittest
-import time
-from boto.sqs.connection import SQSConnection
-from boto.sqs.message import MHMessage
-from boto.exception import SQSError
-
-class SQSConnectionTest (unittest.TestCase):
-
-    def test_1_basic(self):
-        print '--- running SQSConnection tests ---'
-        c = SQSConnection()
-        rs = c.get_all_queues()
-        num_queues = 0
-        for q in rs:
-            num_queues += 1
-    
-        # try illegal name
-        try:
-            queue = c.create_queue('bad_queue_name')
-        except SQSError:
-            pass
-        
-        # now create one that should work and should be unique (i.e. a new one)
-        queue_name = 'test%d' % int(time.time())
-        timeout = 60
-        queue = c.create_queue(queue_name, timeout)
-        time.sleep(60)
-        rs  = c.get_all_queues()
-        i = 0
-        for q in rs:
-            i += 1
-        assert i == num_queues+1
-        assert queue.count_slow() == 0
-
-        # check the visibility timeout
-        t = queue.get_timeout()
-        assert t == timeout, '%d != %d' % (t, timeout)
-
-        # now try to get queue attributes
-        a = q.get_attributes()
-        assert a.has_key('ApproximateNumberOfMessages')
-        assert a.has_key('VisibilityTimeout')
-        a = q.get_attributes('ApproximateNumberOfMessages')
-        assert a.has_key('ApproximateNumberOfMessages')
-        assert not a.has_key('VisibilityTimeout')
-        a = q.get_attributes('VisibilityTimeout')
-        assert not a.has_key('ApproximateNumberOfMessages')
-        assert a.has_key('VisibilityTimeout')
-
-        # now change the visibility timeout
-        timeout = 45
-        queue.set_timeout(timeout)
-        time.sleep(60)
-        t = queue.get_timeout()
-        assert t == timeout, '%d != %d' % (t, timeout)
-    
-        # now add a message
-        message_body = 'This is a test\n'
-        message = queue.new_message(message_body)
-        queue.write(message)
-        time.sleep(60)
-        assert queue.count_slow() == 1
-        time.sleep(90)
-
-        # now read the message from the queue with a 10 second timeout
-        message = queue.read(visibility_timeout=10)
-        assert message
-        assert message.get_body() == message_body
-
-        # now immediately try another read, shouldn't find anything
-        message = queue.read()
-        assert message == None
-
-        # now wait 30 seconds and try again
-        time.sleep(30)
-        message = queue.read()
-        assert message
-
-        # now delete the message
-        queue.delete_message(message)
-        time.sleep(30)
-        assert queue.count_slow() == 0
-
-        # create another queue so we can test force deletion
-        # we will also test MHMessage with this queue
-        queue_name = 'test%d' % int(time.time())
-        timeout = 60
-        queue = c.create_queue(queue_name, timeout)
-        queue.set_message_class(MHMessage)
-        time.sleep(30)
-        
-        # now add a couple of messages
-        message = queue.new_message()
-        message['foo'] = 'bar'
-        queue.write(message)
-        message_body = {'fie' : 'baz', 'foo' : 'bar'}
-        message = queue.new_message(body=message_body)
-        queue.write(message)
-        time.sleep(30)
-
-        m = queue.read()
-        assert m['foo'] == 'bar'
-
-        # now delete that queue and messages
-        c.delete_queue(queue, True)
-
-        print '--- tests completed ---'
-