Make room for functional tests

We need to consolidate the unit tests into a separate
directory so we can run just the unit tests in our py27
tox target. And we can in subsequent reviews add a parallel
directory with functional tests.

Related-Bug: #1439621
Change-Id: I8bf5af953fb31080096c371966f7dfda9edb1bf4
This commit is contained in:
Davanum Srinivas 2015-03-31 10:41:36 -04:00
parent 3a99763261
commit aa039bb011
67 changed files with 59 additions and 106 deletions

View File

@ -2,6 +2,6 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./magnum/tests} $LISTOPT $IDOPTION
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./magnum/tests/unit} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

View File

@ -1,28 +0,0 @@
# -*- coding: utf-8 -*-
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# 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_magnum
----------------------------------
Tests for `magnum` module.
"""
from magnum.tests import base
class TestMagnum(base.TestCase):
def test_something(self):
pass

View File

@ -1,19 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT 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
class TestUnits(unittest.TestCase):
def test_units(self):
assert 5 * 5 == 25

View File

@ -27,7 +27,7 @@ from six.moves.urllib import parse as urlparse
from magnum.api import hooks
from magnum.db import api as dbapi
from magnum.tests.db import base
from magnum.tests.unit.db import base
PATH_PREFIX = '/v1'

View File

@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import bay as api_bay
from magnum.common import utils
from magnum.conductor import api as rpcapi
from magnum import objects
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestBayObject(base.TestCase):

View File

@ -21,10 +21,10 @@ from wsme import types as wtypes
from magnum.api.controllers.v1 import baymodel as api_baymodel
from magnum.common import utils
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestBayModelObject(base.TestCase):

View File

@ -9,7 +9,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from magnum.tests.db import base as db_base
from magnum.tests.unit.db import base as db_base
from mock import patch
from webtest.app import AppError

View File

@ -20,10 +20,10 @@ from wsme import types as wtypes
from magnum.api.controllers.v1 import node as api_node
from magnum.common import utils
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestNodeObject(base.TestCase):

View File

@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import pod as api_pod
from magnum.common import utils
from magnum.conductor import api as rpcapi
from magnum import objects
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestPodObject(base.TestCase):

View File

@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import replicationcontroller as api_rc
from magnum.common import utils
from magnum.conductor import api as rpcapi
from magnum import objects
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestRCObject(base.TestCase):

View File

@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import service as api_service
from magnum.common import utils
from magnum.conductor import api as rpcapi
from magnum import objects
from magnum.tests.api import base as api_base
from magnum.tests.api import utils as apiutils
from magnum.tests import base
from magnum.tests.objects import utils as obj_utils
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
class TestServiceObject(base.TestCase):

View File

@ -23,7 +23,7 @@ import wsme
from magnum.api.controllers.v1 import types
from magnum.common import exception
from magnum.common import utils
from magnum.tests.api import base
from magnum.tests.unit.api import base
class TestMacAddressType(base.FunctionalTest):

View File

@ -16,7 +16,7 @@
import wsme
from magnum.api.controllers.v1 import utils
from magnum.tests.api import base
from magnum.tests.unit.api import base
from oslo_config import cfg

View File

@ -22,9 +22,9 @@ import oslo_messaging as messaging
from magnum.api.controllers import root
from magnum.api import hooks
from magnum.common import context as magnum_context
from magnum.tests.api import base as api_base
from magnum.tests import base
from magnum.tests import fakes
from magnum.tests.unit.api import base as api_base
class TestContextHook(base.BaseTestCase):

View File

@ -19,7 +19,7 @@ from magnum.api.controllers.v1 import node as node_controller
from magnum.api.controllers.v1 import pod as pod_controller
from magnum.api.controllers.v1 import replicationcontroller as rc_controller
from magnum.api.controllers.v1 import service as service_controller
from magnum.tests.db import utils
from magnum.tests.unit.db import utils
def remove_internal(values, internal):

View File

@ -19,8 +19,8 @@ from magnum.conductor.handlers import bay_k8s_heat
from magnum import objects
from magnum.openstack.common import loopingcall
from magnum.tests import base
from magnum.tests.db import base as db_base
from magnum.tests.db import utils
from magnum.tests.unit.db import base as db_base
from magnum.tests.unit.db import utils
import mock
from mock import patch

View File

@ -18,8 +18,8 @@ import copy
import mock
from magnum.conductor import api as conductor_rpcapi
from magnum.tests.db import base
from magnum.tests.db import utils as dbutils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils as dbutils
class RPCAPITestCase(base.DbTestCase):

View File

@ -18,7 +18,7 @@ from magnum.common import utils as magnum_utils
from magnum.db import api as dbapi
import magnum.db.sqlalchemy.api as sa_api
from magnum.db.sqlalchemy import models
from magnum.tests.db import base
from magnum.tests.unit.db import base
class SqlAlchemyCustomTypesTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class DbBayTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class DbBaymodelTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class DbContainerTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class DbNodeTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils as utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils as utils
class DbPodTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils as utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils as utils
class DbRCTestCase(base.DbTestCase):

View File

@ -19,8 +19,8 @@ import six
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum.tests.db import base
from magnum.tests.db import utils as utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils as utils
class DbServiceTestCase(base.DbTestCase):

View File

View File

@ -19,8 +19,8 @@ from testtools.matchers import HasLength
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestBayObject(base.DbTestCase):

View File

@ -19,8 +19,8 @@ from testtools.matchers import HasLength
from magnum.common import exception
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestBayModelObject(base.DbTestCase):

View File

@ -18,8 +18,8 @@ from testtools.matchers import HasLength
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestContainerObject(base.DbTestCase):

View File

@ -18,8 +18,8 @@ from testtools.matchers import HasLength
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestNodeObject(base.DbTestCase):

View File

@ -18,8 +18,8 @@ from testtools.matchers import HasLength
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestPodObject(base.DbTestCase):

View File

@ -18,8 +18,8 @@ from testtools.matchers import HasLength
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestReplicationControllerObject(base.DbTestCase):

View File

@ -18,8 +18,8 @@ from testtools.matchers import HasLength
from magnum.common import utils as magnum_utils
from magnum import objects
from magnum.tests.db import base
from magnum.tests.db import utils
from magnum.tests.unit.db import base
from magnum.tests.unit.db import utils
class TestServiceObject(base.DbTestCase):

View File

@ -15,7 +15,7 @@
"""Magnum object test utilities."""
from magnum import objects
from magnum.tests.db import utils as db_utils
from magnum.tests.unit.db import utils as db_utils
def get_test_baymodel(context, **kw):