Rebase to OpenStack Swift Havana (1.10.0)

Change-Id: I90821230a1a7100c74d97cccc9c445251d0f65e7
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/6157
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 19 insertions, 24 deletions

diff --git a/test/functionalnosetests/test_account.py b/test/functionalnosetests/test_account.py
index d28ff2f..b2f743f 100755
--- a/test/functionalnosetests/test_account.py
+++ b/test/functionalnosetests/test_account.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,22 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Copyright (c) 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
 import unittest
 from nose import SkipTest
 
@@ -45,16 +29,20 @@ class TestAccount(unittest.TestCase):
     def test_metadata(self):
         if skip:
             raise SkipTest
+
         def post(url, token, parsed, conn, value):
             conn.request('POST', parsed.path, '',
-                {'X-Auth-Token': token, 'X-Account-Meta-Test': value})
+                         {'X-Auth-Token': token, 'X-Account-Meta-Test': value})
             return check_response(conn)
+
         def head(url, token, parsed, conn):
             conn.request('HEAD', parsed.path, '', {'X-Auth-Token': token})
             return check_response(conn)
+
         def get(url, token, parsed, conn):
             conn.request('GET', parsed.path, '', {'X-Auth-Token': token})
             return check_response(conn)
+
         resp = retry(post, '')
         resp.read()
         self.assertEquals(resp.status, 204)
@@ -121,13 +109,16 @@ class TestAccount(unittest.TestCase):
     def test_multi_metadata(self):
         if skip:
             raise SkipTest
+
         def post(url, token, parsed, conn, name, value):
             conn.request('POST', parsed.path, '',
                          {'X-Auth-Token': token, name: value})
             return check_response(conn)
+
         def head(url, token, parsed, conn):
             conn.request('HEAD', parsed.path, '', {'X-Auth-Token': token})
             return check_response(conn)
+
         resp = retry(post, 'X-Account-Meta-One', '1')
         resp.read()
         self.assertEquals(resp.status, 204)
@@ -147,26 +138,30 @@ class TestAccount(unittest.TestCase):
     def test_bad_metadata(self):
         if skip:
             raise SkipTest
+
         def post(url, token, parsed, conn, extra_headers):
             headers = {'X-Auth-Token': token}
             headers.update(extra_headers)
             conn.request('POST', parsed.path, '', headers)
             return check_response(conn)
+
         resp = retry(post,
-                {'X-Account-Meta-' + ('k' * MAX_META_NAME_LENGTH): 'v'})
+                     {'X-Account-Meta-' + ('k' * MAX_META_NAME_LENGTH): 'v'})
         resp.read()
         self.assertEquals(resp.status, 204)
-        resp = retry(post,
-                {'X-Account-Meta-' + ('k' * (MAX_META_NAME_LENGTH + 1)): 'v'})
+        resp = retry(
+            post,
+            {'X-Account-Meta-' + ('k' * (MAX_META_NAME_LENGTH + 1)): 'v'})
         resp.read()
         self.assertEquals(resp.status, 400)
 
         resp = retry(post,
-                {'X-Account-Meta-Too-Long': 'k' * MAX_META_VALUE_LENGTH})
+                     {'X-Account-Meta-Too-Long': 'k' * MAX_META_VALUE_LENGTH})
         resp.read()
         self.assertEquals(resp.status, 204)
-        resp = retry(post,
-                {'X-Account-Meta-Too-Long': 'k' * (MAX_META_VALUE_LENGTH + 1)})
+        resp = retry(
+            post,
+            {'X-Account-Meta-Too-Long': 'k' * (MAX_META_VALUE_LENGTH + 1)})
         resp.read()
         self.assertEquals(resp.status, 400)