Remove last vestiges of CONF

Change-Id: I4dfb15373c0e7d4473089f653cd6d3479a3320e5

test/functional/s3api/test_multi_delete.py

@@ -172,7 +172,7 @@ class TestS3ApiMultiDelete(S3ApiBase):
                                    query=query)
         self.assertEqual(get_error_code(body), 'UserKeyMustBeSpecified')
 
-        # specified number of objects are over CONF.max_multi_delete_objects
+        # specified number of objects are over max_multi_delete_objects
         # (Default 1000), but xml size is smaller than 61365 bytes.
         req_objects = ['obj%s' for var in xrange(1001)]
         xml = self._gen_multi_delete_xml(req_objects)
@@ -185,7 +185,7 @@ class TestS3ApiMultiDelete(S3ApiBase):
         self.assertEqual(get_error_code(body), 'MalformedXML')
 
         # specified xml size is over 61365 bytes, but number of objects are
-        # smaller than CONF.max_multi_delete_objects.
+        # smaller than max_multi_delete_objects.
         obj = 'a' * 1024
         req_objects = [obj + str(var) for var in xrange(999)]
         xml = self._gen_multi_delete_xml(req_objects)

test/unit/common/middleware/s3api/__init__.py

@@ -55,9 +55,6 @@ class S3ApiTestCase(unittest.TestCase):
     def __init__(self, name):
         unittest.TestCase.__init__(self, name)
 
-        # CONF.log_level = 'debug'
-        # CONF.storage_domain = 'localhost'
-
     def setUp(self):
         # setup default config
         self.conf = Config({
@@ -68,7 +65,7 @@ class S3ApiTestCase(unittest.TestCase):
             'max_parts_listing': 1000,
             'max_multi_delete_objects': 1000,
             's3_acl': False,
-            'storage_domain': '',
+            'storage_domain': 'localhost',
             'auth_pipeline_check': True,
             'max_upload_part_num': 1000,
             'check_bucket_owner': False,
@@ -78,7 +75,6 @@ class S3ApiTestCase(unittest.TestCase):
         })
         # those 2 settings has existed the original test setup
         self.conf.log_level = 'debug'
-        self.conf.storage_domain = 'localhost'
 
         self.app = FakeApp()
         self.swift = self.app.swift

test/unit/common/middleware/s3api/test_request.py

@@ -92,10 +92,6 @@ class TestRequest(S3ApiTestCase):
         self.swift3.conf.s3_acl = True
         self.swift.s3_acl = True
 
-    def tearDown(self):
-        self.swift3.conf.s3_acl = False
-        self.swift.s3_acl = False
-
     @patch('swift.common.middleware.s3api.acl_handlers.ACL_MAP', Fake_ACL_MAP)
     @patch('swift.common.middleware.s3api.request.S3AclRequest.authenticate',
            lambda x, y: None)