diff options
| -rw-r--r-- | nova/tests/api/ec2/test_api.py (renamed from nova/tests/test_api.py) | 0 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/extensions/test_plugin_api_extensions.py (renamed from nova/tests/test_plugin_api_extensions.py) | 0 | ||||
| -rw-r--r-- | nova/tests/compute/test_vmmode.py (renamed from nova/tests/test_vmmode.py) | 0 | ||||
| -rw-r--r-- | nova/tests/db/test_db_api.py (renamed from nova/tests/test_db_api.py) | 0 | ||||
| -rw-r--r-- | nova/tests/db/test_migration_utils.py (renamed from nova/tests/test_migration_utils.py) | 4 | ||||
| -rw-r--r-- | nova/tests/db/test_migrations.conf (renamed from nova/tests/test_migrations.conf) | 0 | ||||
| -rw-r--r-- | nova/tests/db/test_migrations.py (renamed from nova/tests/test_migrations.py) | 2 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_filters.py (renamed from nova/tests/test_filters.py) | 0 | ||||
| -rw-r--r-- | nova/tests/virt/libvirt/test_image_utils.py (renamed from nova/tests/test_image_utils.py) | 0 |
9 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/api/ec2/test_api.py index 3c3ac6c6c..3c3ac6c6c 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/api/ec2/test_api.py diff --git a/nova/tests/test_plugin_api_extensions.py b/nova/tests/api/openstack/compute/extensions/test_plugin_api_extensions.py index 3aac638c6..3aac638c6 100644 --- a/nova/tests/test_plugin_api_extensions.py +++ b/nova/tests/api/openstack/compute/extensions/test_plugin_api_extensions.py diff --git a/nova/tests/test_vmmode.py b/nova/tests/compute/test_vmmode.py index 374f040ed..374f040ed 100644 --- a/nova/tests/test_vmmode.py +++ b/nova/tests/compute/test_vmmode.py diff --git a/nova/tests/test_db_api.py b/nova/tests/db/test_db_api.py index efe243d1b..efe243d1b 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/db/test_db_api.py diff --git a/nova/tests/test_migration_utils.py b/nova/tests/db/test_migration_utils.py index a15ac251b..3674a7c45 100644 --- a/nova/tests/test_migration_utils.py +++ b/nova/tests/db/test_migration_utils.py @@ -14,6 +14,7 @@ # 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 warnings from migrate.changeset import UniqueConstraint from sqlalchemy.dialects import mysql @@ -28,8 +29,7 @@ from sqlalchemy.types import UserDefinedType, NullType from nova.db.sqlalchemy import api as db from nova.db.sqlalchemy import utils from nova import exception -from nova.tests import test_migrations -import warnings +from nova.tests.db import test_migrations class CustomType(UserDefinedType): diff --git a/nova/tests/test_migrations.conf b/nova/tests/db/test_migrations.conf index 774f14994..774f14994 100644 --- a/nova/tests/test_migrations.conf +++ b/nova/tests/db/test_migrations.conf diff --git a/nova/tests/test_migrations.py b/nova/tests/db/test_migrations.py index 7121bdb04..973f5088c 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/db/test_migrations.py @@ -1427,7 +1427,7 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn): super(TestBaremetalMigrations, self).__init__(*args, **kwargs) self.DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__), - 'virt/baremetal/test_baremetal_migrations.conf') + '../virt/baremetal/test_baremetal_migrations.conf') # Test machines can set the NOVA_TEST_MIGRATIONS_CONF variable # to override the location of the config file for migration testing self.CONFIG_FILE_PATH = os.environ.get( diff --git a/nova/tests/test_filters.py b/nova/tests/scheduler/test_filters.py index c06b50fde..c06b50fde 100644 --- a/nova/tests/test_filters.py +++ b/nova/tests/scheduler/test_filters.py diff --git a/nova/tests/test_image_utils.py b/nova/tests/virt/libvirt/test_image_utils.py index a9768f821..a9768f821 100644 --- a/nova/tests/test_image_utils.py +++ b/nova/tests/virt/libvirt/test_image_utils.py |