Renamed unit.test_api to unit.api

Additional changes in a follow up patch, but
want to make them smaller so they are easier
to review.

- Minor cleanups.

Change-Id: I2129d682f5b88e38090b24de827ccb05f78f4782

designate/tests/unit/api/test_admin_api.py

@@ -13,29 +13,22 @@
 # 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 mock
 
-from designate.tests import TestCase
+import designate.tests
 from designate import exceptions
-
-from oslo_config import cfg
-from oslo_config import fixture as cfg_fixture
-
 from designate.api.admin.views import base
 
 
 class MockRequest(object):
-
     def __init__(self, GET=None):
         self.GET = GET
 
 
-class TestAdminAPI(TestCase):
+class TestAdminAPI(designate.tests.TestCase):
 
     def setUp(self):
-        super(TestCase, self).setUp()
-        self.CONF = self.useFixture(cfg_fixture.Config(cfg.CONF)).conf
+        super(TestAdminAPI, self).setUp()
 
     @mock.patch.object(base.BaseView, '_get_collection_href')
     @mock.patch.object(base.BaseView, '_get_next_href')
@@ -50,15 +43,15 @@ class TestAdminAPI(TestCase):
 
         request = MockRequest(GET=dict(limit="max"))
         links = bv._get_collection_links(request, item_list)
-        self.assertEqual(links, dict(self=None))
+        self.assertEqual(dict(self=None), links)
 
         request = MockRequest(GET=dict(limit="MAX"))
         links = bv._get_collection_links(request, item_list)
-        self.assertEqual(links, dict(self=None))
+        self.assertEqual(dict(self=None), links)
 
         request = MockRequest(GET=dict(limit="200"))
         links = bv._get_collection_links(request, item_list)
-        self.assertEqual(links, dict(self=None, next=None))
+        self.assertEqual(dict(self=None, next=None), links)
 
         request = MockRequest(GET=dict(limit="BOGUS_STRING"))
         self.assertRaises(

designate/tests/unit/api/test_api_v2.py

@@ -13,29 +13,22 @@
 # 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 mock
 
-from designate.tests import TestCase
+import designate.tests
 from designate import exceptions
-
-from oslo_config import cfg
-from oslo_config import fixture as cfg_fixture
-
 from designate.objects.adapters.api_v2 import base
 
 
 class MockRequest(object):
-
     def __init__(self, GET=None):
         self.GET = GET
 
 
-class TestAPIv2(TestCase):
+class TestAPIv2(designate.tests.TestCase):
 
     def setUp(self):
-        super(TestCase, self).setUp()
-        self.CONF = self.useFixture(cfg_fixture.Config(cfg.CONF)).conf
+        super(TestAPIv2, self).setUp()
 
     @mock.patch.object(base.APIv2Adapter, '_get_collection_href')
     @mock.patch.object(base.APIv2Adapter, '_get_next_href')
@@ -46,15 +39,15 @@ class TestAPIv2(TestCase):
         item_list = range(200)
         request = MockRequest(GET=dict(limit="max"))
         links = base.APIv2Adapter._get_collection_links(item_list, request)
-        self.assertEqual(links, dict(self=None))
+        self.assertEqual(dict(self=None), links)
 
         request = MockRequest(GET=dict(limit="MAX"))
         links = base.APIv2Adapter._get_collection_links(item_list, request)
-        self.assertEqual(links, dict(self=None))
+        self.assertEqual(dict(self=None), links, dict(self=None))
 
         request = MockRequest(GET=dict(limit="200"))
         links = base.APIv2Adapter._get_collection_links(item_list, request)
-        self.assertEqual(links, dict(self=None, next=None))
+        self.assertEqual(dict(self=None, next=None), links)
 
         request = MockRequest(GET=dict(limit="BOGUS_STRING"))
         self.assertRaises(

designate/tests/unit/api/test_middleware.py

@@ -13,14 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-"""
-Test API middleware
-"""
-
 import fixtures
-import oslotest.base
 import mock
+import oslotest.base
 
 from designate.api import middleware
 
@@ -160,10 +155,10 @@ class SSLMiddlewareTest(oslotest.base.BaseTestCase):
     def test_bogus_header(self):
         self.request.environ['wsgi.url_scheme'] = 'http'
         # If someone sends something bogus, it will infect their self links
-        self.request.environ['HTTP_X_FORWARDED_PROTO'] = 'poo'
+        self.request.environ['HTTP_X_FORWARDED_PROTO'] = 'test'
         self.app(self.request)
 
-        self.assertEqual('poo', self.request.environ['wsgi.url_scheme'])
+        self.assertEqual('test', self.request.environ['wsgi.url_scheme'])
 
     def test_http_header(self):
         self.request.environ['wsgi.url_scheme'] = ''
@@ -182,8 +177,8 @@ class SSLMiddlewareTest(oslotest.base.BaseTestCase):
     def test_override_proto(self):
         self.request.environ['wsgi.url_scheme'] = 'http'
         self.request.environ['HTTP_X_FORWARDED_PROTO'] = 'https'
-        self.app.override = 'poo'
+        self.app.override = 'test'
 
         self.app(self.request)
 
-        self.assertEqual('poo', self.request.environ['wsgi.url_scheme'])
+        self.assertEqual('test', self.request.environ['wsgi.url_scheme'])

designate/tests/unit/test_central/test_basic.py

@@ -13,7 +13,6 @@
 # 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
 
 import fixtures