openstack/nova
Code Issues Proposed changes

Merge "Fixes the Hyper-V VolumeOpsTestCase base class"

Browse Source
This commit is contained in:
Jenkins
2014-03-05 07:47:59 +00:00
committed by Gerrit Code Review
parent 943d5283a2 c1a64c94ef
commit f11071bc4a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/virt/hyperv/test_hypervapi.py
View File

@@ -69,15 +69,15 @@ CONF = cfg.CONF
CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif', 'hyperv') CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif', 'hyperv')
class HyperVAPITestCase(test.NoDBTestCase): class HyperVAPIBaseTestCase(test.NoDBTestCase):
"""Unit tests for Hyper-V driver calls.""" """Base unit tests class for Hyper-V driver calls."""
def __init__(self, test_case_name): def __init__(self, test_case_name):
self._mox = mox.Mox() self._mox = mox.Mox()
super(HyperVAPITestCase, self).__init__(test_case_name) super(HyperVAPIBaseTestCase, self).__init__(test_case_name)
def setUp(self): def setUp(self):
super(HyperVAPITestCase, self).setUp() super(HyperVAPIBaseTestCase, self).setUp()
self._user_id = 'fake' self._user_id = 'fake'
self._project_id = 'fake' self._project_id = 'fake'
@@ -248,7 +248,11 @@ class HyperVAPITestCase(test.NoDBTestCase):
def tearDown(self): def tearDown(self):
self._mox.UnsetStubs() self._mox.UnsetStubs()
super(HyperVAPITestCase, self).tearDown() super(HyperVAPIBaseTestCase, self).tearDown()
class HyperVAPITestCase(HyperVAPIBaseTestCase):
"""Unit tests for Hyper-V driver calls."""
def test_get_available_resource(self): def test_get_available_resource(self):
cpu_info = {'Architecture': 'fake', cpu_info = {'Architecture': 'fake',
@@ -1668,7 +1672,7 @@ class HyperVAPITestCase(test.NoDBTestCase):
self.assertEqual(fake_vm_id, connect_info['internal_access_path']) self.assertEqual(fake_vm_id, connect_info['internal_access_path'])
class VolumeOpsTestCase(HyperVAPITestCase): class VolumeOpsTestCase(HyperVAPIBaseTestCase):
"""Unit tests for VolumeOps class.""" """Unit tests for VolumeOps class."""
def setUp(self): def setUp(self):