Rename package: tobiko.tests -> tobiko.tests.unit

The main reason is that it could get people confuse
to have functional and scenario test cases inside
the same package as unit tests cases.

Change-Id: I63330f383f01f04a45c5542d655a1bdb24c09b75

tobiko/tests/unit/cmd/test_base.py

@@ -15,10 +15,10 @@
 from __future__ import absolute_import
 
 from tobiko.cmd import base
-from tobiko.tests.openstack import base as test_base
+from tobiko.tests.unit import openstack
 
 
-class TobikoCMDTest(test_base.OpenstackTest):
+class TobikoCMDTest(openstack.OpenstackTest):
 
     command_name = 'tobiko-base'
     command_class = base.TobikoCMD

tobiko/tests/unit/cmd/test_fixture.py

@@ -20,7 +20,7 @@ import subprocess
 
 import tobiko
 from tobiko.cmd import fixture as _fixture
-from tobiko.tests import test_fixture
+from tobiko.tests.unit import test_fixture
 from tobiko.tests import unit
 
 

tobiko/tests/unit/openstack/__init__.py

@@ -16,7 +16,6 @@ from __future__ import absolute_import
 
 import mock
 
-from tobiko.config import CONF
 from tobiko.openstack import keystone
 from tobiko.tests import unit
 
@@ -31,7 +30,8 @@ class OpenstackTest(unit.TobikoUnitTest):
 
     def setUp(self):
         super(OpenstackTest, self).setUp()
-        self.patch_object(CONF.tobiko, 'keystone',
+        from tobiko import config
+        self.patch_object(config.CONF.tobiko, 'keystone',
                           self.default_keystone_credentials)
 
     def patch_get_heat_client(self, *args, **kwargs):

tobiko/tests/unit/openstack/heat/test_client.py

@@ -17,8 +17,8 @@ from heatclient.v1 import client as heatclient
 
 from tobiko.openstack import keystone
 from tobiko.openstack import heat
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
-from tobiko.tests.openstack import test_client
+from tobiko.tests.unit.openstack import test_client
 
 
 class HeatClientFixtureTest(test_client.OpenstackClientFixtureTest):
@@ -27,7 +27,7 @@ class HeatClientFixtureTest(test_client.OpenstackClientFixtureTest):
         return heat.HeatClientFixture(session=session)
 
 
-class GetHeatClientTest(base.OpenstackTest):
+class GetHeatClientTest(openstack.OpenstackTest):
 
     def test_get_heat_client(self, session=None, shared=True):
         client1 = heat.get_heat_client(session=session, shared=shared)

tobiko/tests/unit/openstack/heat/test_stack.py

@@ -24,7 +24,7 @@ import yaml
 import tobiko
 from tobiko.openstack import heat
 from tobiko.openstack import keystone
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 
 class MyStack(heat.HeatStackFixture):
@@ -61,7 +61,7 @@ class MyTemplateFixture(tobiko.SharedFixture):
         self.template = heat.HeatTemplate.from_dict(self._template)
 
 
-class HeatStackFixtureTest(base.OpenstackTest):
+class HeatStackFixtureTest(openstack.OpenstackTest):
 
     def test_init(self, fixture_class=MyStack, stack_name=None, template=None,
                   parameters=None, wait_interval=None, client=None):

tobiko/tests/unit/openstack/heat/test_template.py

@@ -16,10 +16,10 @@ from __future__ import absolute_import
 import os
 
 from tobiko.openstack import heat
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 
-class GetHeatTemplateTest(base.OpenstackTest):
+class GetHeatTemplateTest(openstack.OpenstackTest):
 
     template_dirs = [os.path.dirname(__file__)]
     template_file = 'my-stack.yaml'

tobiko/tests/unit/openstack/keystone/test_credentials.py

@@ -18,7 +18,7 @@ import tobiko
 from tobiko import config
 from tobiko.openstack import keystone
 from tobiko.openstack.keystone import _credentials
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 V2_PARAMS = {
     'api_version': 2,
@@ -68,7 +68,7 @@ def make_credentials(params, **kwargs):
     return keystone.keystone_credentials(**params)
 
 
-class KeystoneCredentialsTest(base.OpenstackTest):
+class KeystoneCredentialsTest(openstack.OpenstackTest):
 
     def test_validate_from_params_v2(self):
         credentials = make_credentials(V2_PARAMS)
@@ -113,7 +113,7 @@ class KeystoneCredentialsTest(base.OpenstackTest):
                           credentials.validate)
 
 
-class EnvironKeystoneCredentialsFixtureTest(base.OpenstackTest):
+class EnvironKeystoneCredentialsFixtureTest(openstack.OpenstackTest):
 
     def test_init(self):
         fixture = _credentials.EnvironKeystoneCredentialsFixture()
@@ -155,7 +155,7 @@ class EnvironKeystoneCredentialsFixtureTest(base.OpenstackTest):
         self.assertEqual(V3_PARAMS, fixture.credentials.to_dict())
 
 
-class ConfigKeystoneCredentialsFixtureTest(base.OpenstackTest):
+class ConfigKeystoneCredentialsFixtureTest(openstack.OpenstackTest):
 
     def patch_config(self, params, **kwargs):
         credentials = make_credentials(params, **kwargs)
@@ -194,7 +194,7 @@ class ConfigKeystoneCredentialsFixtureTest(base.OpenstackTest):
         self.assertEqual(V3_PARAMS, fixture.credentials.to_dict())
 
 
-class DefaultKeystoneCredentialsFixtureTest(base.OpenstackTest):
+class DefaultKeystoneCredentialsFixtureTest(openstack.OpenstackTest):
 
     def setUp(self):
         super(DefaultKeystoneCredentialsFixtureTest, self).setUp()

tobiko/tests/unit/openstack/keystone/test_session.py

@@ -21,7 +21,7 @@ import mock
 
 import tobiko
 from tobiko.openstack import keystone
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 
 CREDENTIALS = keystone.keystone_credentials(
@@ -74,7 +74,7 @@ class CheckSessionCredentialsMixin(object):
 
 
 class KeystoneSessionFixtureTest(CheckSessionCredentialsMixin,
-                                 base.OpenstackTest):
+                                 openstack.OpenstackTest):
 
     default_credentials_fixture = (
         'tobiko.openstack.keystone._credentials.'
@@ -124,7 +124,7 @@ class KeystoneSessionFixtureTest(CheckSessionCredentialsMixin,
 
 
 class KeystoneSessionManagerTest(CheckSessionCredentialsMixin,
-                                 base.OpenstackTest):
+                                 openstack.OpenstackTest):
 
     def test_init(self):
         manager = keystone.KeystoneSessionManager()
@@ -167,7 +167,7 @@ class KeystoneSessionManagerTest(CheckSessionCredentialsMixin,
         init_session.assert_called_once_with(credentials=CREDENTIALS)
 
 
-class GetKeystomeSessionTest(base.OpenstackTest):
+class GetKeystomeSessionTest(openstack.OpenstackTest):
 
     def test_get_keystone_session(self, credentials=None, shared=True):
         session1 = keystone.get_keystone_session(credentials=credentials,

tobiko/tests/unit/openstack/neutron/test_client.py

@@ -17,8 +17,8 @@ from neutronclient.v2_0 import client as neutronclient
 
 from tobiko.openstack import keystone
 from tobiko.openstack import neutron
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
-from tobiko.tests.openstack import test_client
+from tobiko.tests.unit.openstack import test_client
 
 
 class NeutronClientFixtureTest(test_client.OpenstackClientFixtureTest):
@@ -27,7 +27,7 @@ class NeutronClientFixtureTest(test_client.OpenstackClientFixtureTest):
         return neutron.NeutronClientFixture(session=session)
 
 
-class GetNeutronClientTest(base.OpenstackTest):
+class GetNeutronClientTest(openstack.OpenstackTest):
 
     def test_get_neutron_client(self, session=None, shared=True):
         client1 = neutron.get_neutron_client(session=session, shared=shared)

tobiko/tests/unit/openstack/neutron/test_extension.py

@@ -14,10 +14,10 @@
 from __future__ import absolute_import
 
 from tobiko.openstack import neutron
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 
-class NeutronExtensionTest(base.OpenstackTest):
+class NeutronExtensionTest(openstack.OpenstackTest):
 
     extensions = ['ext-1', 'ext-2', 'ext-3']
 

tobiko/tests/unit/openstack/nova/test_client.py

@@ -17,8 +17,8 @@ from novaclient.v2 import client as novaclient
 
 from tobiko.openstack import keystone
 from tobiko.openstack import nova
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
-from tobiko.tests.openstack import test_client
+from tobiko.tests.unit.openstack import test_client
 
 
 class NovaClientFixtureTest(test_client.OpenstackClientFixtureTest):
@@ -27,7 +27,7 @@ class NovaClientFixtureTest(test_client.OpenstackClientFixtureTest):
         return nova.NovaClientFixture(session=session)
 
 
-class GetNovaClientTest(base.OpenstackTest):
+class GetNovaClientTest(openstack.OpenstackTest):
 
     def test_get_nova_client(self, session=None, shared=True):
         client1 = nova.get_nova_client(session=session, shared=shared)

tobiko/tests/unit/openstack/test_client.py

@@ -21,7 +21,7 @@ import mock
 import tobiko
 from tobiko.openstack import _client
 from tobiko.openstack import keystone
-from tobiko.tests.openstack import base
+from tobiko.tests.unit import openstack
 
 
 CLIENT = object()
@@ -46,7 +46,7 @@ class SessionFixture(tobiko.SharedFixture):
         self.session = SESSION
 
 
-class OpenstackClientFixtureTest(base.OpenstackTest):
+class OpenstackClientFixtureTest(openstack.OpenstackTest):
 
     def create_client(self, session=None):
         return ClientFixture(session=session)
@@ -99,7 +99,7 @@ class OpenstackClientFixtureTest(base.OpenstackTest):
             self.assertIsNone(client.session_fixture)
 
 
-class OpenstackClientManagerTest(base.OpenstackTest):
+class OpenstackClientManagerTest(openstack.OpenstackTest):
 
     def setUp(self):
         super(OpenstackClientManagerTest, self).setUp()

tox.ini

@@ -20,7 +20,7 @@ setenv =
     OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
     PYTHON=python
 commands =
-    stestr run --black-regex "{env:OS_BLACK_REGEX:}" {posargs}
+    stestr run {posargs}
 
 
 [testenv]
@@ -32,8 +32,7 @@ deps =
 passenv = {[base]passenv}
 setenv =
     {[base]setenv}
-    OS_TEST_PATH={toxinidir}/tobiko/tests
+    OS_TEST_PATH={toxinidir}/tobiko/tests/unit
-    OS_BLACK_REGEX=tobiko.tests.(scenario|functional)
 commands = {[base]commands}
 
 
@@ -46,7 +45,7 @@ setenv =
 commands =
     find . -type f -name ".coverage.*" -delete
     coverage erase
-    stestr run --no-subunit-trace --black-regex "{env:OS_BLACK_REGEX:}" {posargs}
+    stestr run --no-subunit-trace {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml