Merge "Moving more tests to appropriate locations"

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):

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(