Adding some tests

swift/proxy/server.py

@@ -386,17 +386,16 @@ class Controller(object):
             except (Exception, TimeoutError):
                 self.exception_occurred(node, _('Account'),
                     _('Trying to get account info for %s') % path)
-        if result_code == 404:
-            if autocreate:
-                if len(account) > MAX_ACCOUNT_NAME_LENGTH:
-                    return None, None
-                headers = {'X-Timestamp': normalize_timestamp(time.time()),
-                           'x-trans-id': self.trans_id}
-                resp = self.make_requests(Request.blank('/v1' + path),
-                    self.app.account_ring, partition, 'PUT',
-                    path, [headers] * len(nodes))
-                if resp.status_int // 100 == 2:
-                    result_code = 200
+        if result_code == 404 and autocreate:
+            if len(account) > MAX_ACCOUNT_NAME_LENGTH:
+                return None, None
+            headers = {'X-Timestamp': normalize_timestamp(time.time()),
+                       'X-Trans-Id': self.trans_id}
+            resp = self.make_requests(Request.blank('/v1' + path),
+                self.app.account_ring, partition, 'PUT',
+                path, [headers] * len(nodes))
+            if resp.status_int // 100 == 2:
+                result_code = 200
         if self.app.memcache and result_code in (200, 404):
             if result_code == 200:
                 cache_timeout = self.app.recheck_account_existence

test/unit/common/test_utils.py

@@ -768,6 +768,10 @@ log_name = yarr'''
         self.assertEquals(utils.human_readable(1237940039285380274899124224),
                           '1024Yi')
 
+    def test_TRUE_VALUES(self):
+        for v in utils.TRUE_VALUES:
+            self.assertEquals(v, v.lower())
+
 
 if __name__ == '__main__':
     unittest.main()

test/unit/proxy/test_server.py

@@ -393,6 +393,26 @@ class TestController(unittest.TestCase):
             test(404, 507, 503)
             test(503, 503, 503)
 
+    def test_account_info_account_autocreate(self):
+        with save_globals():
+            proxy_server.http_connect = \
+                fake_http_connect(404, 404, 404, 201, 201, 201)
+            partition, nodes = \
+                self.controller.account_info(self.account, autocreate=False)
+            self.check_account_info_return(partition, nodes, is_none=True)
+
+            proxy_server.http_connect = \
+                fake_http_connect(404, 404, 404, 201, 201, 201)
+            partition, nodes = \
+                self.controller.account_info(self.account)
+            self.check_account_info_return(partition, nodes, is_none=True)
+
+            proxy_server.http_connect = \
+                fake_http_connect(404, 404, 404, 201, 201, 201)
+            partition, nodes = \
+                self.controller.account_info(self.account, autocreate=True)
+            self.check_account_info_return(partition, nodes)
+
     def check_container_info_return(self, ret, is_none=False):
         if is_none:
             partition, nodes, read_acl, write_acl = None, None, None, None