openstack
/
nova
Code Issues Proposed changes

Convert TestCases to NoDBTestCase 

NoDBTestCase is faster because it skips initializing a database for
tests which don't actually talk to the database. Its also nicer
because its more explicit about the dependancies of a given test.
This is a third pass at moving test cases over to the database
lacking version, but further work is required here.

Change-Id: Ibbe86329c846e9d6df16f3bbe53a75efff6fd604
Partial-Bug: 1227473
This commit is contained in:
Michael Still 2013-09-21 06:51:22 +10:00
parent a4b5502904
commit bdbcdd869d
54 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/api/ec2/test_error_response.py
View File

@ -38,7 +38,7 @@ class TestServerExceptionEC2(Exception):
code = 500
class Ec2ErrorResponseTestCase(test.TestCase):
class Ec2ErrorResponseTestCase(test.NoDBTestCase):
"""
Test EC2 error responses.

2
nova/tests/api/ec2/test_faults.py
View File

@ -20,7 +20,7 @@ from nova import test
from nova import wsgi
class TestFaults(test.TestCase):
class TestFaults(test.NoDBTestCase):
"""Tests covering ec2 Fault class."""
def test_fault_exception(self):

6
nova/tests/api/ec2/test_middleware.py
View File

@ -42,7 +42,7 @@ def conditional_forbid(req):
return 'OK'
class LockoutTestCase(test.TestCase):
class LockoutTestCase(test.NoDBTestCase):
"""Test case for the Lockout middleware."""
def setUp(self): # pylint: disable=C0103
super(LockoutTestCase, self).setUp()
@ -90,7 +90,7 @@ class LockoutTestCase(test.TestCase):
self.assertFalse(self._is_locked_out('test'))
class ExecutorTestCase(test.TestCase):
class ExecutorTestCase(test.NoDBTestCase):
def setUp(self):
super(ExecutorTestCase, self).setUp()
self.executor = ec2.Executor()
@ -151,7 +151,7 @@ class FakeResponse(object):
return '{}'
class KeystoneAuthTestCase(test.TestCase):
class KeystoneAuthTestCase(test.NoDBTestCase):
def setUp(self):
super(KeystoneAuthTestCase, self).setUp()
self.kauth = ec2.EC2KeystoneAuth(conditional_forbid)

6
nova/tests/api/openstack/compute/contrib/test_admin_actions.py
View File

@ -139,7 +139,7 @@ class CommonMixin(object):
self.mox.UnsetStubs()
class AdminActionsTest(CommonMixin, test.TestCase):
class AdminActionsTest(CommonMixin, test.NoDBTestCase):
def test_actions(self):
actions = ['pause', 'unpause', 'suspend', 'resume', 'migrate',
'resetNetwork', 'injectNetworkInfo', 'lock',
@ -262,7 +262,7 @@ class AdminActionsTest(CommonMixin, test.TestCase):
self.assertEqual(403, res.status_int)
class CreateBackupTests(CommonMixin, test.TestCase):
class CreateBackupTests(CommonMixin, test.NoDBTestCase):
def setUp(self):
super(CreateBackupTests, self).setUp()
self.mox.StubOutWithMock(common,
@ -430,7 +430,7 @@ class CreateBackupTests(CommonMixin, test.TestCase):
body_map=body_map)
class ResetStateTests(test.TestCase):
class ResetStateTests(test.NoDBTestCase):
def setUp(self):
super(ResetStateTests, self).setUp()

2
nova/tests/api/openstack/compute/contrib/test_agents.py
View File

@ -82,7 +82,7 @@ class FakeRequestWithHypervisor(object):
GET = {'hypervisor': 'kvm'}
class AgentsTest(test.TestCase):
class AgentsTest(test.NoDBTestCase):
def setUp(self):
super(AgentsTest, self).setUp()

2
nova/tests/api/openstack/compute/contrib/test_aggregates.py
View File

@ -39,7 +39,7 @@ class FakeRequest(object):
environ = {"nova.context": context.get_admin_context()}
class AggregateTestCase(test.TestCase):
class AggregateTestCase(test.NoDBTestCase):
"""Test Case for aggregates admin api."""
def setUp(self):

4
nova/tests/api/openstack/compute/contrib/test_availability_zone.py
View File

@ -78,7 +78,7 @@ def fake_get_availability_zones(context):
return ['nova'], []
class AvailabilityZoneApiTest(test.TestCase):
class AvailabilityZoneApiTest(test.NoDBTestCase):
def setUp(self):
super(AvailabilityZoneApiTest, self).setUp()
availability_zones.reset_cache()
@ -225,7 +225,7 @@ class AvailabilityZoneApiTest(test.TestCase):
matchers.DictMatches(expected_response))
class AvailabilityZoneSerializerTest(test.TestCase):
class AvailabilityZoneSerializerTest(test.NoDBTestCase):
def test_availability_zone_index_detail_serializer(self):
def _verify_zone(zone_dict, tree):
self.assertEqual(tree.tag, 'availabilityZone')

6
nova/tests/api/openstack/compute/contrib/test_cells.py
View File

@ -81,7 +81,7 @@ def fake_cells_api_get_all_cell_info(*args):
return cells
class CellsTest(test.TestCase):
class CellsTest(test.NoDBTestCase):
def setUp(self):
super(CellsTest, self).setUp()
self.stubs.Set(cells_rpcapi.CellsAPI, 'cell_get', fake_cell_get)
@ -396,7 +396,7 @@ class CellsTest(test.TestCase):
self.controller.sync_instances, req, body=body)
class TestCellsXMLSerializer(test.TestCase):
class TestCellsXMLSerializer(test.NoDBTestCase):
def test_multiple_cells(self):
fixture = {'cells': fake_cells_api_get_all_cell_info()}
@ -455,7 +455,7 @@ class TestCellsXMLSerializer(test.TestCase):
self.assertEqual(len(res_tree), 0)
class TestCellsXMLDeserializer(test.TestCase):
class TestCellsXMLDeserializer(test.NoDBTestCase):
def test_cell_deserializer(self):
caps_dict = {'cap1': 'a;b',
'cap2': 'c;d'}

4
nova/tests/api/openstack/compute/contrib/test_certificates.py
View File

@ -30,7 +30,7 @@ def fake_create_cert(context, *args, **kwargs):
return 'fakepk', 'fakecert'
class CertificatesTest(test.TestCase):
class CertificatesTest(test.NoDBTestCase):
def setUp(self):
super(CertificatesTest, self).setUp()
self.context = context.RequestContext('fake', 'fake')
@ -61,7 +61,7 @@ class CertificatesTest(test.TestCase):
self.assertEqual(res_dict, response)
class CertificatesSerializerTest(test.TestCase):
class CertificatesSerializerTest(test.NoDBTestCase):
def test_index_serializer(self):
serializer = certificates.CertificateTemplate()
text = serializer.serialize(dict(

4
nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
View File

@ -50,7 +50,7 @@ def utils_vpn_ping(addr, port, timoeout=0.05, session_id=None):
return True
class CloudpipeTest(test.TestCase):
class CloudpipeTest(test.NoDBTestCase):
def setUp(self):
super(CloudpipeTest, self).setUp()
@ -130,7 +130,7 @@ class CloudpipeTest(test.TestCase):
self.assertEqual(res_dict, response)
class CloudpipesXMLSerializerTest(test.TestCase):
class CloudpipesXMLSerializerTest(test.NoDBTestCase):
def test_default_serializer(self):
serializer = cloudpipe.CloudpipeTemplate()
exemplar = dict(cloudpipe=dict(instance_id='1234-1234-1234-1234'))

2
nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py
View File

@ -36,7 +36,7 @@ def fake_network_update(context, network_id, values):
network[key] = values[key]
class CloudpipeUpdateTest(test.TestCase):
class CloudpipeUpdateTest(test.NoDBTestCase):
def setUp(self):
super(CloudpipeUpdateTest, self).setUp()

2
nova/tests/api/openstack/compute/contrib/test_console_output.py
View File

@ -52,7 +52,7 @@ def fake_get_not_found(*args, **kwargs):
raise exception.NotFound()
class ConsoleOutputExtensionTest(test.TestCase):
class ConsoleOutputExtensionTest(test.NoDBTestCase):
def setUp(self):
super(ConsoleOutputExtensionTest, self).setUp()

2
nova/tests/api/openstack/compute/contrib/test_consoles.py
View File

@ -64,7 +64,7 @@ def fake_get_not_found(self, context, instance_uuid):
raise exception.InstanceNotFound(instance_id=instance_uuid)
class ConsolesExtensionTest(test.TestCase):
class ConsolesExtensionTest(test.NoDBTestCase):
def setUp(self):
super(ConsolesExtensionTest, self).setUp()

2
nova/tests/api/openstack/compute/contrib/test_evacuate.py
View File

@ -57,7 +57,7 @@ def fake_service_get_by_compute_host(self, context, host):
}
class EvacuateTest(test.TestCase):
class EvacuateTest(test.NoDBTestCase):
_methods = ('resize', 'evacuate')

2
nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
View File

@ -77,7 +77,7 @@ def fake_create(name, memory_mb, vcpus, root_gb, ephemeral_gb,
return newflavor
class FlavorManageTest(test.TestCase):
class FlavorManageTest(test.NoDBTestCase):
def setUp(self):
super(FlavorManageTest, self).setUp()
self.stubs.Set(flavors,

2
nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py
View File

@ -51,7 +51,7 @@ def fake_get_all_flavors_sorted_list(context=None, inactive=False,
]
class FlavorRxtxTest(test.TestCase):
class FlavorRxtxTest(test.NoDBTestCase):
content_type = 'application/json'
prefix = ''

2
nova/tests/api/openstack/compute/contrib/test_flavor_swap.py
View File

@ -52,7 +52,7 @@ def fake_get_all_flavors_sorted_list(context=None, inactive=False,
]
class FlavorSwapTest(test.TestCase):
class FlavorSwapTest(test.NoDBTestCase):
content_type = 'application/json'
prefix = ''

2
nova/tests/api/openstack/compute/contrib/test_image_size.py
View File

@ -72,7 +72,7 @@ def fake_detail(*args, **kwargs):
return IMAGES
class ImageSizeTest(test.TestCase):
class ImageSizeTest(test.NoDBTestCase):
content_type = 'application/json'
prefix = 'OS-EXT-IMG-SIZE'

6
nova/tests/api/openstack/compute/contrib/test_instance_actions.py
View File

@ -65,7 +65,7 @@ def format_event(event):
return event
class InstanceActionsPolicyTest(test.TestCase):
class InstanceActionsPolicyTest(test.NoDBTestCase):
def setUp(self):
super(InstanceActionsPolicyTest, self).setUp()
self.controller = instance_actions.InstanceActionsController()
@ -106,7 +106,7 @@ class InstanceActionsPolicyTest(test.TestCase):
str(uuid.uuid4()), '1')
class InstanceActionsTest(test.TestCase):
class InstanceActionsTest(test.NoDBTestCase):
def setUp(self):
super(InstanceActionsTest, self).setUp()
self.controller = instance_actions.InstanceActionsController()
@ -205,7 +205,7 @@ class InstanceActionsTest(test.TestCase):
FAKE_UUID)
class InstanceActionsSerializerTest(test.TestCase):
class InstanceActionsSerializerTest(test.NoDBTestCase):
def setUp(self):
super(InstanceActionsSerializerTest, self).setUp()
self.fake_actions = copy.deepcopy(fake_instance_actions.FAKE_ACTIONS)

2
nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py
View File

@ -107,7 +107,7 @@ def fake_last_completed_audit_period(unit=None, before=None):
return begin1, end1
class InstanceUsageAuditLogTest(test.TestCase):
class InstanceUsageAuditLogTest(test.NoDBTestCase):
def setUp(self):
super(InstanceUsageAuditLogTest, self).setUp()
self.context = context.get_admin_context()

4
nova/tests/api/openstack/compute/contrib/test_migrations.py
View File

@ -62,7 +62,7 @@ class FakeRequest(object):
GET = {}
class MigrationsTestCase(test.TestCase):
class MigrationsTestCase(test.NoDBTestCase):
def setUp(self):
"""Run before each test."""
super(MigrationsTestCase, self).setUp()
@ -101,7 +101,7 @@ class MigrationsTestCase(test.TestCase):
self.req)
class MigrationsTemplateTest(test.TestCase):
class MigrationsTemplateTest(test.NoDBTestCase):
def setUp(self):
super(MigrationsTemplateTest, self).setUp()
self.serializer = migrations.MigrationsTemplate()

2
nova/tests/api/openstack/compute/contrib/test_multinic_xs.py
View File

@ -42,7 +42,7 @@ def compute_api_get(self, context, instance_id):
return {'id': 1, 'uuid': instance_id}
class FixedIpTest(test.TestCase):
class FixedIpTest(test.NoDBTestCase):
def setUp(self):
super(FixedIpTest, self).setUp()
fakes.stub_out_networking(self.stubs)

2
nova/tests/api/openstack/compute/contrib/test_rescue.py
View File

@ -33,7 +33,7 @@ def unrescue(self, context, instance):
pass
class RescueTest(test.TestCase):
class RescueTest(test.NoDBTestCase):
def setUp(self):
super(RescueTest, self).setUp()

4
nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py
View File

@ -37,7 +37,7 @@ def fake_instance_get(self, _context, instance_uuid):
return {'uuid': instance_uuid}
class ServerDiagnosticsTest(test.TestCase):
class ServerDiagnosticsTest(test.NoDBTestCase):
def setUp(self):
super(ServerDiagnosticsTest, self).setUp()
@ -58,7 +58,7 @@ class ServerDiagnosticsTest(test.TestCase):
self.assertEqual(output, {'data': 'Some diagnostic info'})
class TestServerDiagnosticsXMLSerializer(test.TestCase):
class TestServerDiagnosticsXMLSerializer(test.NoDBTestCase):
namespace = wsgi.XMLNS_V11
def _tag(self, elem):

2
nova/tests/api/openstack/compute/contrib/test_used_limits.py
View File

@ -32,7 +32,7 @@ class FakeRequest(object):
self.GET = {'reserved': 1} if reserved else {}
class UsedLimitsTestCase(test.TestCase):
class UsedLimitsTestCase(test.NoDBTestCase):
def setUp(self):
"""Run before each test."""
super(UsedLimitsTestCase, self).setUp()

4
nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py
View File

@ -39,7 +39,7 @@ def get_vifs_by_instance(self, context, instance_id):
'address': '11-11-11-11-11-11'}]
class ServerVirtualInterfaceTest(test.TestCase):
class ServerVirtualInterfaceTest(test.NoDBTestCase):
def setUp(self):
super(ServerVirtualInterfaceTest, self).setUp()
@ -67,7 +67,7 @@ class ServerVirtualInterfaceTest(test.TestCase):
self.assertEqual(res_dict, response)
class ServerVirtualInterfaceSerializerTest(test.TestCase):
class ServerVirtualInterfaceSerializerTest(test.NoDBTestCase):
def setUp(self):
super(ServerVirtualInterfaceSerializerTest, self).setUp()
self.namespace = wsgi.XMLNS_V11

2
nova/tests/api/openstack/compute/plugins/v3/test_attach_interfaces.py
View File

@ -132,7 +132,7 @@ def fake_get_instance(self, context, intance_id, columns_to_join=None):
return {}
class InterfaceAttachTests(test.TestCase):
class InterfaceAttachTests(test.NoDBTestCase):
def setUp(self):
super(InterfaceAttachTests, self).setUp()
self.flags(neutron_auth_strategy=None)

2
nova/tests/api/openstack/compute/test_api.py
View File

@ -29,7 +29,7 @@ from nova import test
from nova.tests.api.openstack import fakes
class APITest(test.TestCase):
class APITest(test.NoDBTestCase):
def _wsgi_app(self, inner_app):
# simpler version of the app than fakes.wsgi_app

4
nova/tests/api/openstack/compute/test_consoles.py
View File

@ -124,7 +124,7 @@ def stub_instance(id, user_id='fake', project_id='fake', host=None,
return instance
class ConsolesControllerTest(test.TestCase):
class ConsolesControllerTest(test.NoDBTestCase):
def setUp(self):
super(ConsolesControllerTest, self).setUp()
self.flags(verbose=True)
@ -252,7 +252,7 @@ class ConsolesControllerTest(test.TestCase):
req, self.uuid, '20')
class TestConsolesXMLSerializer(test.TestCase):
class TestConsolesXMLSerializer(test.NoDBTestCase):
def test_show(self):
fixture = {'console': {'id': 20,
'password': 'fake_password',

2
nova/tests/api/openstack/compute/test_v3_extensions.py
View File

@ -57,7 +57,7 @@ class fake_loaded_extension_info(object):
return {'core1': None, 'core2': None, 'noncore1': None}
class ExtensionLoadingTestCase(test.TestCase):
class ExtensionLoadingTestCase(test.NoDBTestCase):
def _set_v3_core(self, core_extensions):
openstack.API_V3_CORE_EXTENSIONS = core_extensions

4
nova/tests/api/test_auth.py
View File

@ -21,7 +21,7 @@ from nova.openstack.common.gettextutils import _
from nova import test
class TestNovaKeystoneContextMiddleware(test.TestCase):
class TestNovaKeystoneContextMiddleware(test.NoDBTestCase):
def setUp(self):
super(TestNovaKeystoneContextMiddleware, self).setUp()
@ -68,7 +68,7 @@ class TestNovaKeystoneContextMiddleware(test.TestCase):
self.assertEqual(response.status, '500 Internal Server Error')
class TestKeystoneMiddlewareRoles(test.TestCase):
class TestKeystoneMiddlewareRoles(test.NoDBTestCase):
def setUp(self):
super(TestKeystoneMiddlewareRoles, self).setUp()

4
nova/tests/api/test_sizelimit.py
View File

@ -23,7 +23,7 @@ CONF = cfg.CONF
MAX_REQUEST_BODY_SIZE = CONF.osapi_max_request_body_size
class TestLimitingReader(test.TestCase):
class TestLimitingReader(test.NoDBTestCase):
def test_limiting_reader(self):
BYTES = 1024
@ -69,7 +69,7 @@ class TestLimitingReader(test.TestCase):
_consume_all_read)
class TestRequestBodySizeLimiter(test.TestCase):
class TestRequestBodySizeLimiter(test.NoDBTestCase):
def setUp(self):
super(TestRequestBodySizeLimiter, self).setUp()

2
nova/tests/api/test_validator.py
View File

@ -22,7 +22,7 @@ from nova.api import validator
from nova import test
class ValidatorTestCase(test.TestCase):
class ValidatorTestCase(test.NoDBTestCase):
def test_validate(self):
fixture = {

2
nova/tests/api/test_wsgi.py
View File

@ -29,7 +29,7 @@ import webob
from nova import wsgi
class Test(test.TestCase):
class Test(test.NoDBTestCase):
def test_debug(self):

8
nova/tests/image/test_glance.py
View File

@ -47,7 +47,7 @@ class NullWriter(object):
pass
class TestGlanceSerializer(test.TestCase):
class TestGlanceSerializer(test.NoDBTestCase):
def test_serialize(self):
metadata = {'name': 'image1',
'is_public': True,
@ -83,7 +83,7 @@ class TestGlanceSerializer(test.TestCase):
self.assertEqual(glance._convert_from_string(converted), metadata)
class TestGlanceImageService(test.TestCase):
class TestGlanceImageService(test.NoDBTestCase):
"""
Tests the Glance image service.
@ -758,7 +758,7 @@ def _create_failing_glance_client(info):
return MyGlanceStubClient()
class TestGlanceClientWrapper(test.TestCase):
class TestGlanceClientWrapper(test.NoDBTestCase):
def setUp(self):
super(TestGlanceClientWrapper, self).setUp()
@ -944,7 +944,7 @@ class TestGlanceClientWrapper(test.TestCase):
self.assertEqual(info['num_calls'], 2)
class TestGlanceUrl(test.TestCase):
class TestGlanceUrl(test.NoDBTestCase):
def test_generate_glance_http_url(self):
generated_url = glance.generate_glance_url()

2
nova/tests/keymgr/test_key.py
View File

@ -25,7 +25,7 @@ from nova.keymgr import key
from nova import test
class KeyTestCase(test.TestCase):
class KeyTestCase(test.NoDBTestCase):
def _create_key(self):
raise NotImplementedError()

2
nova/tests/keymgr/test_key_mgr.py
View File

@ -22,7 +22,7 @@ Test cases for the key manager.
from nova import test
class KeyManagerTestCase(test.TestCase):
class KeyManagerTestCase(test.NoDBTestCase):
def _create_key_manager(self):
raise NotImplementedError()

2
nova/tests/network/security_group/test_neutron_driver.py
View File

@ -28,7 +28,7 @@ from nova.network.security_group import neutron_driver
from nova import test
class TestNeutronDriver(test.TestCase):
class TestNeutronDriver(test.NoDBTestCase):
def setUp(self):
super(TestNeutronDriver, self).setUp()
self.mox.StubOutWithMock(neutronv2, 'get_client')

2
nova/tests/network/test_linux_net.py
View File

@ -222,7 +222,7 @@ def get_associated(context, network_id, host=None, address=None):
return result
class LinuxNetworkTestCase(test.TestCase):
class LinuxNetworkTestCase(test.NoDBTestCase):
def setUp(self):
super(LinuxNetworkTestCase, self).setUp()

2
nova/tests/network/test_rpcapi.py
View File

@ -29,7 +29,7 @@ from nova.tests import matchers
CONF = cfg.CONF
class NetworkRpcAPITestCase(test.TestCase):
class NetworkRpcAPITestCase(test.NoDBTestCase):
def setUp(self):
super(NetworkRpcAPITestCase, self).setUp()
self.flags(multi_host=True)

2
nova/tests/scheduler/test_filters.py
View File

@ -33,7 +33,7 @@ class Filter2(filters.BaseFilter):
pass
class FiltersTestCase(test.TestCase):
class FiltersTestCase(test.NoDBTestCase):
def test_filter_all(self):
filter_obj_list = ['obj1', 'obj2', 'obj3']
filter_properties = 'fake_filter_properties'

2
nova/tests/virt/baremetal/test_driver.py
View File

@ -55,7 +55,7 @@ BAREMETAL_FLAGS = dict(
)
class BareMetalDriverNoDBTestCase(test.TestCase):
class BareMetalDriverNoDBTestCase(test.NoDBTestCase):
def setUp(self):
super(BareMetalDriverNoDBTestCase, self).setUp()

2
nova/tests/virt/test_block_device.py
View File

@ -25,7 +25,7 @@ from nova.virt import driver
from nova.volume import cinder
class TestDriverBlockDevice(test.TestCase):
class TestDriverBlockDevice(test.NoDBTestCase):
driver_classes = {
'swap': driver_block_device.DriverSwapBlockDevice,
'ephemeral': driver_block_device.DriverEphemeralBlockDevice,

2
nova/tests/virt/test_driver.py
View File

@ -29,7 +29,7 @@ class FakeDriver2(FakeDriver):
pass
class ToDriverRegistryTestCase(test.TestCase):
class ToDriverRegistryTestCase(test.NoDBTestCase):
def assertDriverInstance(self, inst, class_, *args, **kwargs):
self.assertEquals(class_, inst.__class__)

2
nova/tests/virt/test_images.py
View File

@ -17,7 +17,7 @@ from nova import test
from nova.virt import images
class QemuTestCase(test.TestCase):
class QemuTestCase(test.NoDBTestCase):
def test_qemu_info_with_bad_path(self):
image_info = images.qemu_img_info("/path/that/does/not/exist")
self.assertTrue(image_info)

4
nova/tests/virt/test_virt.py
View File

@ -23,7 +23,7 @@ from nova.virt.disk import api as disk_api
from nova.virt import driver
class TestVirtDriver(test.TestCase):
class TestVirtDriver(test.NoDBTestCase):
def test_block_device(self):
swap = {'device_name': '/dev/sdb',
'swap_size': 1}
@ -84,7 +84,7 @@ class TestVirtDriver(test.TestCase):
'swap_size': 1}))
class TestVirtDisk(test.TestCase):
class TestVirtDisk(test.NoDBTestCase):
def setUp(self):
super(TestVirtDisk, self).setUp()
self.executes = []

2
nova/tests/virt/test_virt_disk.py
View File

@ -24,7 +24,7 @@ from nova.virt.disk import api as diskapi
from nova.virt.disk.vfs import guestfs as vfsguestfs
class VirtDiskTest(test.TestCase):
class VirtDiskTest(test.NoDBTestCase):
def setUp(self):
super(VirtDiskTest, self).setUp()

2
nova/tests/virt/test_virt_disk_vfs_guestfs.py
View File

@ -23,7 +23,7 @@ from nova.tests import fakeguestfs
from nova.virt.disk.vfs import guestfs as vfsimpl
class VirtDiskVFSGuestFSTest(test.TestCase):
class VirtDiskVFSGuestFSTest(test.NoDBTestCase):
def setUp(self):
super(VirtDiskVFSGuestFSTest, self).setUp()

4
nova/tests/virt/test_virt_disk_vfs_localfs.py
View File

@ -122,7 +122,7 @@ def fake_execute(*args, **kwargs):
files[path]["content"] = kwargs["process_input"]
class VirtDiskVFSLocalFSTestPaths(test.TestCase):
class VirtDiskVFSLocalFSTestPaths(test.NoDBTestCase):
def setUp(self):
super(VirtDiskVFSLocalFSTestPaths, self).setUp()
@ -152,7 +152,7 @@ class VirtDiskVFSLocalFSTestPaths(test.TestCase):
'etc/../../../something.conf')
class VirtDiskVFSLocalFSTest(test.TestCase):
class VirtDiskVFSLocalFSTest(test.NoDBTestCase):
def test_makepath(self):
global dirs, commands
dirs = []

2
nova/tests/virt/xenapi/test_agent.py
View File

@ -37,7 +37,7 @@ def _get_fake_instance(**kwargs):
}
class AgentTestCaseBase(test.TestCase):
class AgentTestCaseBase(test.NoDBTestCase):
def _create_agent(self, instance):
self.session = "session"
self.virtapi = "virtapi"

28
nova/tests/virt/xenapi/test_vm_utils.py
View File

@ -70,7 +70,7 @@ def _fake_noop(*args, **kwargs):
return
class LookupTestCase(test.TestCase):
class LookupTestCase(test.NoDBTestCase):
def setUp(self):
super(LookupTestCase, self).setUp()
@ -126,7 +126,7 @@ class LookupTestCase(test.TestCase):
check_rescue=True)
class GenerateConfigDriveTestCase(test.TestCase):
class GenerateConfigDriveTestCase(test.NoDBTestCase):
def test_no_admin_pass(self):
# This is here to avoid masking errors, it shouldn't be used normally
self.useFixture(fixtures.MonkeyPatch(
@ -179,7 +179,7 @@ class GenerateConfigDriveTestCase(test.TestCase):
'userdevice')
class XenAPIGetUUID(test.TestCase):
class XenAPIGetUUID(test.NoDBTestCase):
def test_get_this_vm_uuid_new_kernel(self):
self.mox.StubOutWithMock(vm_utils, '_get_sys_hypervisor_uuid')
@ -224,7 +224,7 @@ class FakeSession(object):
pass
class FetchVhdImageTestCase(test.TestCase):
class FetchVhdImageTestCase(test.NoDBTestCase):
def setUp(self):
super(FetchVhdImageTestCase, self).setUp()
self.context = context.get_admin_context()
@ -415,7 +415,7 @@ class FetchVhdImageTestCase(test.TestCase):
self.mox.VerifyAll()
class TestImageCompression(test.TestCase):
class TestImageCompression(test.NoDBTestCase):
def test_image_compression(self):
# Testing for nova.conf, too low, negative, and a correct value.
self.assertEqual(vm_utils.get_compression_level(), None)
@ -427,7 +427,7 @@ class TestImageCompression(test.TestCase):
self.assertEqual(vm_utils.get_compression_level(), 6)
class ResizeHelpersTestCase(test.TestCase):
class ResizeHelpersTestCase(test.NoDBTestCase):
def test_get_min_sectors(self):
self.mox.StubOutWithMock(utils, 'execute')
@ -533,7 +533,7 @@ class ResizeHelpersTestCase(test.TestCase):
vm_utils._resize_part_and_fs("fake", 0, 20, 30)
class CheckVDISizeTestCase(test.TestCase):
class CheckVDISizeTestCase(test.NoDBTestCase):
def setUp(self):
super(CheckVDISizeTestCase, self).setUp()
self.context = 'fakecontext'
@ -653,7 +653,7 @@ class GetInstanceForVdisForSrTestCase(stubs.XenAPITestBase):
self.assertNotEquals(vdi_uuid, None)
class VMRefOrRaiseVMFoundTestCase(test.TestCase):
class VMRefOrRaiseVMFoundTestCase(test.NoDBTestCase):
def test_lookup_call(self):
mock = mox.Mox()
@ -677,7 +677,7 @@ class VMRefOrRaiseVMFoundTestCase(test.TestCase):
mock.VerifyAll()
class VMRefOrRaiseVMNotFoundTestCase(test.TestCase):
class VMRefOrRaiseVMNotFoundTestCase(test.NoDBTestCase):
def test_exception_raised(self):
mock = mox.Mox()
@ -754,7 +754,7 @@ class BittorrentTestCase(stubs.XenAPITestBase):
self._test_create_image('none')
class ShutdownTestCase(test.TestCase):
class ShutdownTestCase(test.NoDBTestCase):
def test_hardshutdown_should_return_true_when_vm_is_shutdown(self):
self.mock = mox.Mox()
@ -779,7 +779,7 @@ class ShutdownTestCase(test.TestCase):
session, instance, vm_ref))
class CreateVBDTestCase(test.TestCase):
class CreateVBDTestCase(test.NoDBTestCase):
def setUp(self):
super(CreateVBDTestCase, self).setUp()
self.session = FakeSession()
@ -1052,7 +1052,7 @@ class GenerateDiskTestCase(stubs.XenAPITestBase):
self._check_vdi(vdi_ref)
class GenerateEphemeralTestCase(test.TestCase):
class GenerateEphemeralTestCase(test.NoDBTestCase):
def setUp(self):
super(GenerateEphemeralTestCase, self).setUp()
self.session = "session"
@ -1117,7 +1117,7 @@ class FakeFile(object):
self._file_operations.append((self.seek, offset))
class StreamDiskTestCase(test.TestCase):
class StreamDiskTestCase(test.NoDBTestCase):
def setUp(self):
import __builtin__
super(StreamDiskTestCase, self).setUp()
@ -1211,7 +1211,7 @@ class VMUtilsSRPath(stubs.XenAPITestBase):
"/var/run/sr-mount/sr_uuid")
class CreateKernelRamdiskTestCase(test.TestCase):
class CreateKernelRamdiskTestCase(test.NoDBTestCase):
def setUp(self):
super(CreateKernelRamdiskTestCase, self).setUp()
self.context = "context"

2
nova/tests/virt/xenapi/test_vmops.py
View File

@ -54,7 +54,7 @@ class VMOpsTestBase(stubs.XenAPITestBase):
xenapi_fake.destroy_vm(vm)
class VMOpsTestCase(test.TestCase):
class VMOpsTestCase(test.NoDBTestCase):
def setUp(self):
super(VMOpsTestCase, self).setUp()
self._setup_mock_vmops()

2
nova/tests/virt/xenapi/test_volumeops.py
View File

@ -21,7 +21,7 @@ from nova.tests.virt.xenapi import stubs
from nova.virt.xenapi import volumeops
class VolumeAttachTestCase(test.TestCase):
class VolumeAttachTestCase(test.NoDBTestCase):
def test_detach_volume_call(self):
registered_calls = []

20
nova/tests/virt/xenapi/test_xenapi.py
View File

@ -1499,7 +1499,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase):
self.assertTrue(fake_destroy_kernel_ramdisk.called)
class XenAPIDiffieHellmanTestCase(test.TestCase):
class XenAPIDiffieHellmanTestCase(test.NoDBTestCase):
"""Unit tests for Diffie-Hellman code."""
def setUp(self):
super(XenAPIDiffieHellmanTestCase, self).setUp()
@ -1921,7 +1921,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
vmops._resize_ensure_vm_is_shutdown(fake_instance, "ref")
class XenAPIImageTypeTestCase(test.TestCase):
class XenAPIImageTypeTestCase(test.NoDBTestCase):
"""Test ImageType class."""
def test_to_string(self):
@ -1951,7 +1951,7 @@ class XenAPIImageTypeTestCase(test.TestCase):
self._assert_role('root', vm_utils.ImageType.DISK_VHD)
class XenAPIDetermineDiskImageTestCase(test.TestCase):
class XenAPIDetermineDiskImageTestCase(test.NoDBTestCase):
"""Unit tests for code that detects the ImageType."""
def assert_disk_type(self, image_meta, expected_disk_type):
actual = vm_utils.determine_disk_image_type(image_meta)
@ -1974,7 +1974,7 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
self.assert_disk_type(image_meta, None)
class XenAPIDetermineIsPVTestCase(test.TestCase):
class XenAPIDetermineIsPVTestCase(test.NoDBTestCase):
"""Unit tests for code that detects the PV status based on ImageType."""
def assert_pv_status(self, disk_image_type, os_type, expected_pv_status):
session = None
@ -2002,7 +2002,7 @@ class XenAPIDetermineIsPVTestCase(test.TestCase):
self.assert_pv_status(None, None, False)
class CompareVersionTestCase(test.TestCase):
class CompareVersionTestCase(test.NoDBTestCase):
def test_less_than(self):
# Test that cmp_version compares a as less than b.
self.assertTrue(vmops.cmp_version('1.2.3.4', '1.2.3.5') < 0)
@ -2145,7 +2145,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase):
self.assertEqual('foo', stats['hypervisor_hostname'])
class ToSupportedInstancesTestCase(test.TestCase):
class ToSupportedInstancesTestCase(test.NoDBTestCase):
def test_default_return_value(self):
self.assertEquals([],
host.to_supported_instances(None))
@ -3159,7 +3159,7 @@ class ResourcePoolWithStubs(StubDependencies, pool.ResourcePool):
"""A ResourcePool, use stub dependencies."""
class HypervisorPoolTestCase(test.TestCase):
class HypervisorPoolTestCase(test.NoDBTestCase):
fake_aggregate = {
'id': 98,
@ -3193,7 +3193,7 @@ class HypervisorPoolTestCase(test.TestCase):
slave.compute_rpcapi._mock_calls)
class SwapXapiHostTestCase(test.TestCase):
class SwapXapiHostTestCase(test.NoDBTestCase):
def test_swapping(self):
self.assertEquals(
@ -3811,7 +3811,7 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase):
self.assertTrue(self.called_fake_get_vm_opaque_ref)
class XenAPISessionTestCase(test.TestCase):
class XenAPISessionTestCase(test.NoDBTestCase):
def _get_mock_xapisession(self, software_version):
class MockXapiSession(xenapi_conn.XenAPISession):
def __init__(_ignore):
@ -3874,7 +3874,7 @@ class XenAPISessionTestCase(test.TestCase):
)
class XenAPIFakeTestCase(test.TestCase):
class XenAPIFakeTestCase(test.NoDBTestCase):
def test_query_matches(self):
record = {'a': '1', 'b': '2', 'c_d': '3'}