Merging in latest boto.

boto/tests/test_sdbconnection.py

Index: boto/tests/test_sdbconnection.py
diff --git a/boto/tests/test_sdbconnection.py b/boto/tests/test_sdbconnection.py
deleted file mode 100644
index eac57f72bd3128f7866da8faf145422a10c908fc..0000000000000000000000000000000000000000
--- a/boto/tests/test_sdbconnection.py
+++ /dev/null
@@ -1,120 +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 SDBConnection
-"""
-
-import unittest
-import time
-from boto.sdb.connection import SDBConnection
-from boto.exception import SDBResponseError
-
-class SDBConnectionTest (unittest.TestCase):
-
-    def test_1_basic(self):
-        print '--- running SDBConnection tests ---'
-        c = SDBConnection()
-        rs = c.get_all_domains()
-        num_domains = len(rs)
-
-        # try illegal name
-        try:
-            domain = c.create_domain('bad:domain:name')
-        except SDBResponseError:
-            pass
-
-        # now create one that should work and should be unique (i.e. a new one)
-        domain_name = 'test%d' % int(time.time())
-        domain = c.create_domain(domain_name)
-        rs = c.get_all_domains()
-        assert len(rs) == num_domains + 1
-
-        # now let's a couple of items and attributes
-        item_1 = 'item1'
-        same_value = 'same_value'
-        attrs_1 = {'name1' : same_value, 'name2' : 'diff_value_1'}
-        domain.put_attributes(item_1, attrs_1)
-        item_2 = 'item2'
-        attrs_2 = {'name1' : same_value, 'name2' : 'diff_value_2'}
-        domain.put_attributes(item_2, attrs_2)
-
-        # try to get the attributes and see if they match
-        item = domain.get_attributes(item_1, consistent_read=True)
-        assert len(item.keys()) == len(attrs_1.keys())
-        assert item['name1'] == attrs_1['name1']
-        assert item['name2'] == attrs_1['name2']
-
-        # try a search or two
-        query = 'select * from %s where name1="%s"' % (domain_name, same_value)
-        rs = domain.select(query, consistent_read=True)
-        n = 0
-        for item in rs:
-            n += 1
-        assert n == 2
-        query = 'select * from %s where name2="diff_value_2"' % domain_name
-        rs = domain.select(query, consistent_read=True)
-        n = 0
-        for item in rs:
-            n += 1
-        assert n == 1
-
-        # delete all attributes associated with item_1
-        stat = domain.delete_attributes(item_1)
-        assert stat
-
-        # now try a batch put operation on the domain
-        item3 = {'name3_1' : 'value3_1',
-                 'name3_2' : 'value3_2',
-                 'name3_3' : ['value3_3_1', 'value3_3_2']}
-
-        item4 = {'name4_1' : 'value4_1',
-                 'name4_2' : ['value4_2_1', 'value4_2_2'],
-                 'name4_3' : 'value4_3'}
-        items = {'item3' : item3, 'item4' : item4}
-        domain.batch_put_attributes(items)
-
-        item = domain.get_attributes('item3', consistent_read=True)
-        assert item['name3_2'] == 'value3_2'
-
-        # now try a batch delete operation (variation #1)
-        items = {'item3' : item3}
-        stat = domain.batch_delete_attributes(items)
-
-        item = domain.get_attributes('item3', consistent_read=True)
-        assert not item
-
-        # now try a batch delete operation (variation #2)
-        stat = domain.batch_delete_attributes({'item4' : None})
-
-        item = domain.get_attributes('item4', consistent_read=True)
-        assert not item
-
-        # now delete the domain
-        stat = c.delete_domain(domain)
-        assert stat
-
-        print '--- tests completed ---'
-