Replace using tests.utils part1

It is the second step to replace using tests.utils with
stack.common.test.
In this patch first part of tests is changed for using
openstack.common.test and added needed fixtures in test classes.

Change-Id: Id95743059818a80af5bf1fab4ae1cee528b92809
bp: common-unit-tests

2 files changed, 18 insertions, 14 deletions

diff --git a/tests/unit/middleware/test_correlation_id.py b/tests/unit/middleware/test_correlation_id.py
index 11939e9..f330ada 100644
--- a/tests/unit/middleware/test_correlation_id.py
+++ b/tests/unit/middleware/test_correlation_id.py
@@ -17,12 +17,17 @@
 
 import mock
 
+from openstack.common.fixture import moxstubout
 from openstack.common.middleware import correlation_id
+from openstack.common import test
 from openstack.common import uuidutils
-from tests import utils
 
 
-class CorrelationIdMiddlewareTest(utils.BaseTestCase):
+class CorrelationIdMiddlewareTest(test.BaseTestCase):
+
+    def setUp(self):
+        super(CorrelationIdMiddlewareTest, self).setUp()
+        self.stubs = self.useFixture(moxstubout.MoxStubout()).stubs
 
     def test_process_request(self):
         app = mock.Mock()
diff --git a/tests/unit/middleware/test_sizelimit.py b/tests/unit/middleware/test_sizelimit.py
index 3666b54..0f14b41 100644
--- a/tests/unit/middleware/test_sizelimit.py
+++ b/tests/unit/middleware/test_sizelimit.py
@@ -12,18 +12,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 import six
 import webob
 
+from openstack.common.fixture import config
 from openstack.common.middleware import sizelimit
-from tests import utils
+from openstack.common import test
 
-CONF = cfg.CONF
-MAX_REQUEST_BODY_SIZE = CONF.max_request_body_size
 
-
-class TestLimitingReader(utils.BaseTestCase):
+class TestLimitingReader(test.BaseTestCase):
 
     def test_limiting_reader(self):
         BYTES = 1024
@@ -69,10 +66,12 @@ class TestLimitingReader(utils.BaseTestCase):
                           _consume_all_read)
 
 
-class TestRequestBodySizeLimiter(utils.BaseTestCase):
+class TestRequestBodySizeLimiter(test.BaseTestCase):
 
     def setUp(self):
         super(TestRequestBodySizeLimiter, self).setUp()
+        self.MAX_REQUEST_BODY_SIZE = \
+            self.useFixture(config.Config()).conf.max_request_body_size
 
         @webob.dec.wsgify()
         def fake_app(req):
@@ -82,19 +81,19 @@ class TestRequestBodySizeLimiter(utils.BaseTestCase):
         self.request = webob.Request.blank('/', method='POST')
 
     def test_content_length_acceptable(self):
-        self.request.headers['Content-Length'] = MAX_REQUEST_BODY_SIZE
-        self.request.body = "0" * MAX_REQUEST_BODY_SIZE
+        self.request.headers['Content-Length'] = self.MAX_REQUEST_BODY_SIZE
+        self.request.body = "0" * self.MAX_REQUEST_BODY_SIZE
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status_int, 200)
 
     def test_content_length_too_large(self):
-        self.request.headers['Content-Length'] = MAX_REQUEST_BODY_SIZE + 1
-        self.request.body = "0" * (MAX_REQUEST_BODY_SIZE + 1)
+        self.request.headers['Content-Length'] = self.MAX_REQUEST_BODY_SIZE + 1
+        self.request.body = "0" * (self.MAX_REQUEST_BODY_SIZE + 1)
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status_int, 413)
 
     def test_request_too_large_no_content_length(self):
-        self.request.body = "0" * (MAX_REQUEST_BODY_SIZE + 1)
+        self.request.body = "0" * (self.MAX_REQUEST_BODY_SIZE + 1)
         self.request.headers['Content-Length'] = None
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status_int, 413)