Moving test_misc tests to better locations
We now have more specific places to put the tests contained within `test_misc`. Change-Id: Ifa29bdfcea5053d991ece6397d9c70d62157fc10
This commit is contained in:
@@ -45,6 +45,7 @@ import collections
|
|||||||
import commands
|
import commands
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
import datetime
|
import datetime
|
||||||
|
import glob
|
||||||
import os
|
import os
|
||||||
import urlparse
|
import urlparse
|
||||||
import uuid
|
import uuid
|
||||||
@@ -1517,3 +1518,30 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn):
|
|||||||
bm_nodes = db_utils.get_table(engine, 'bm_nodes')
|
bm_nodes = db_utils.get_table(engine, 'bm_nodes')
|
||||||
columns = [c.name for c in bm_nodes.columns]
|
columns = [c.name for c in bm_nodes.columns]
|
||||||
self.assertNotIn(u'prov_mac_address', columns)
|
self.assertNotIn(u'prov_mac_address', columns)
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectTestCase(test.TestCase):
|
||||||
|
|
||||||
|
def test_all_migrations_have_downgrade(self):
|
||||||
|
topdir = os.path.normpath(os.path.dirname(__file__) + '/../../../')
|
||||||
|
py_glob = os.path.join(topdir, "nova", "db", "sqlalchemy",
|
||||||
|
"migrate_repo", "versions", "*.py")
|
||||||
|
|
||||||
|
missing_downgrade = []
|
||||||
|
for path in glob.iglob(py_glob):
|
||||||
|
has_upgrade = False
|
||||||
|
has_downgrade = False
|
||||||
|
with open(path, "r") as f:
|
||||||
|
for line in f:
|
||||||
|
if 'def upgrade(' in line:
|
||||||
|
has_upgrade = True
|
||||||
|
if 'def downgrade(' in line:
|
||||||
|
has_downgrade = True
|
||||||
|
|
||||||
|
if has_upgrade and not has_downgrade:
|
||||||
|
fname = os.path.basename(path)
|
||||||
|
missing_downgrade.append(fname)
|
||||||
|
|
||||||
|
helpful_msg = (_("The following migrations are missing a downgrade:"
|
||||||
|
"\n\t%s") % '\n\t'.join(sorted(missing_downgrade)))
|
||||||
|
self.assert_(not missing_downgrade, helpful_msg)
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
||||||
|
|
||||||
# Copyright 2010 OpenStack Foundation
|
|
||||||
#
|
|
||||||
# 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 glob
|
|
||||||
import os
|
|
||||||
|
|
||||||
from nova import exception
|
|
||||||
from nova import test
|
|
||||||
|
|
||||||
|
|
||||||
class ExceptionTestCase(test.TestCase):
|
|
||||||
@staticmethod
|
|
||||||
def _raise_exc(exc):
|
|
||||||
raise exc()
|
|
||||||
|
|
||||||
def test_exceptions_raise(self):
|
|
||||||
# NOTE(dprince): disable format errors since we are not passing kwargs
|
|
||||||
self.flags(fatal_exception_format_errors=False)
|
|
||||||
for name in dir(exception):
|
|
||||||
exc = getattr(exception, name)
|
|
||||||
if isinstance(exc, type):
|
|
||||||
self.assertRaises(exc, self._raise_exc, exc)
|
|
||||||
|
|
||||||
|
|
||||||
class ProjectTestCase(test.TestCase):
|
|
||||||
|
|
||||||
def test_all_migrations_have_downgrade(self):
|
|
||||||
topdir = os.path.normpath(os.path.dirname(__file__) + '/../../')
|
|
||||||
py_glob = os.path.join(topdir, "nova", "db", "sqlalchemy",
|
|
||||||
"migrate_repo", "versions", "*.py")
|
|
||||||
missing_downgrade = []
|
|
||||||
for path in glob.iglob(py_glob):
|
|
||||||
has_upgrade = False
|
|
||||||
has_downgrade = False
|
|
||||||
with open(path, "r") as f:
|
|
||||||
for line in f:
|
|
||||||
if 'def upgrade(' in line:
|
|
||||||
has_upgrade = True
|
|
||||||
if 'def downgrade(' in line:
|
|
||||||
has_downgrade = True
|
|
||||||
|
|
||||||
if has_upgrade and not has_downgrade:
|
|
||||||
fname = os.path.basename(path)
|
|
||||||
missing_downgrade.append(fname)
|
|
||||||
|
|
||||||
helpful_msg = (_("The following migrations are missing a downgrade:"
|
|
||||||
"\n\t%s") % '\n\t'.join(sorted(missing_downgrade)))
|
|
||||||
self.assert_(not missing_downgrade, helpful_msg)
|
|
||||||
Reference in New Issue
Block a user