Move TestTransportBase out of base

TestTransportBase is referred to in a couple places, but only
used in test_transport.  This change cleans that up.

Change-Id: Ic2df1b6a1ad010de983a5a8fb57db79adc441d43

openstack/tests/unit/base.py

@@ -51,26 +51,3 @@ class TestCase(testtools.TestCase):
             self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
 
         self.log_fixture = self.useFixture(fixtures.FakeLogger())
-
-
-class TestTransportBase(TestCase):
-
-    TEST_URL = 'http://www.root.url'
-
-    def assertRequestHeaderEqual(self, mocked_req, name, val):
-        """Verify that the last request made contains a header and its value
-
-        """
-        headers = mocked_req.last_request.headers
-        self.assertEqual(val, headers.get(name))
-
-    def assertResponseOK(self, resp, status=200, body=None):
-        """Verify the Response object contains expected values
-
-        Tests our defaults for a successful request.
-        """
-
-        self.assertTrue(resp.ok)
-        self.assertEqual(status, resp.status_code)
-        if body:
-            self.assertEqual(body, resp.text)

openstack/tests/unit/object_store/v1/test_proxy.py

@@ -18,7 +18,6 @@ from openstack.object_store.v1 import account
 from openstack.object_store.v1 import container
 from openstack.object_store.v1 import obj
 from openstack import session
-from openstack.tests.unit import base
 from openstack.tests.unit import fakes
 from openstack.tests.unit import test_proxy_base
 from openstack import transport
@@ -78,9 +77,7 @@ class TestObjectStoreProxy(test_proxy_base.TestProxyBase):
                         value=["object"], container="container")
 
 
-class Test_containers(TestObjectStoreProxy, base.TestTransportBase):
+class Test_containers(TestObjectStoreProxy):
-
-    TEST_URL = fakes.FakeAuthenticator.ENDPOINT
 
     def setUp(self):
         super(Test_containers, self).setUp()
@@ -159,9 +156,7 @@ class Test_containers(TestObjectStoreProxy, base.TestTransportBase):
 #                      httpretty.last_request().path)
 
 
-class Test_objects(TestObjectStoreProxy, base.TestTransportBase):
+class Test_objects(TestObjectStoreProxy):
-
-    TEST_URL = fakes.FakeAuthenticator.ENDPOINT
 
     def setUp(self):
         super(Test_objects, self).setUp()

openstack/tests/unit/test_resource.py

@@ -23,7 +23,6 @@ from openstack import format
 from openstack import resource
 from openstack import session
 from openstack.tests.unit import base
-from openstack.tests.unit import fakes
 from openstack import utils
 
 
@@ -264,9 +263,7 @@ class HeaderTests(base.TestCase):
                                     json={})
 
 
-class ResourceTests(base.TestTransportBase):
+class ResourceTests(base.TestCase):
-
-    TEST_URL = fakes.FakeAuthenticator.ENDPOINT
 
     def setUp(self):
         super(ResourceTests, self).setUp()

openstack/tests/unit/test_transport.py

@@ -42,7 +42,30 @@ fake_record2 = {
 }
 
 
-class TestTransport(base.TestTransportBase):
+class TestTransportBase(base.TestCase):
+
+    TEST_URL = 'http://www.root.url'
+
+    def assertRequestHeaderEqual(self, mocked_req, name, val):
+        """Verify that the last request made contains a header and its value
+
+        """
+        headers = mocked_req.last_request.headers
+        self.assertEqual(val, headers.get(name))
+
+    def assertResponseOK(self, resp, status=200, body=None):
+        """Verify the Response object contains expected values
+
+        Tests our defaults for a successful request.
+        """
+
+        self.assertTrue(resp.ok)
+        self.assertEqual(status, resp.status_code)
+        if body:
+            self.assertEqual(body, resp.text)
+
+
+class TestTransport(TestTransportBase):
 
     def setUp(self):
         super(TestTransport, self).setUp()
@@ -320,7 +343,7 @@ class TestTransport(base.TestTransportBase):
         self.assertEqual(status, exc.status_code)
 
 
-class TestTransportDebug(base.TestTransportBase):
+class TestTransportDebug(TestTransportBase):
 
     def setUp(self):
         super(TestTransportDebug, self).setUp()
@@ -374,7 +397,7 @@ class TestTransportDebug(base.TestTransportBase):
             self.assertIn(v, self.log_fixture.output)
 
 
-class TestTransportRedirects(base.TestTransportBase):
+class TestTransportRedirects(TestTransportBase):
 
     REDIRECT_CHAIN = [
         'http://myhost:3445/',