openstack
/
cinder
Code Issues Proposed changes

Merge "Handle assertRaisesRegexp Python 3 deprecation"

This commit is contained in:
Zuul 2017-11-16 05:09:41 +00:00 committed by Gerrit Code Review
parent 90b3b7bbdf c79d151954
commit 1d5511335e
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/test.py
View File

@ -256,6 +256,13 @@ class TestCase(testtools.TestCase):
coordination.COORDINATOR.start()
self.addCleanup(coordination.COORDINATOR.stop)
if six.PY3:
# TODO(smcginnis) Python 3 deprecates assertRaisesRegexp to
# assertRaisesRegex, but Python 2 does not have the new name. This
# can be removed once we stop supporting py2 or the new name is
# added.
self.assertRaisesRegexp = self.assertRaisesRegex
def _restore_obj_registry(self):
objects_base.CinderObjectRegistry._registry._obj_classes = \
self._base_test_obj_backup

44
cinder/tests/unit/volume/drivers/nec/test_volume.py
View File

@ -16,9 +16,9 @@
import ddt
import mock
import unittest
from cinder import exception
from cinder import test
from cinder.volume import configuration as conf
from cinder.volume.drivers.nec import volume_helper
@ -394,13 +394,14 @@ class DummyVolume(object):
@ddt.ddt
class VolumeIDConvertTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class VolumeIDConvertTest(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(VolumeIDConvertTest, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -412,9 +413,6 @@ class VolumeIDConvertTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.hostports,
self.max_ld_count) = self.configs(self.xml)
def tearDown(self):
pass
@ddt.data(("AAAAAAAA", "LX:37mA82"), ("BBBBBBBB", "LX:3R9ZwR"))
@ddt.unpack
def test_volumeid_should_change_62scale(self, volid, ldname):
@ -447,13 +445,14 @@ class VolumeIDConvertTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
{'volid': volid, 'ldname': ldname})
class NominatePoolLDTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class NominatePoolLDTest(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(NominatePoolLDTest, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -469,9 +468,6 @@ class NominatePoolLDTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.max_ld_count) = self.configs(self.xml)
self._numofld_per_pool = 1024
def tearDown(self):
pass
def test_getxml(self):
self.assertIsNotNone(self.xml, "iSMview xml should not be None")
@ -608,13 +604,14 @@ class NominatePoolLDTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
999999999999)
class VolumeCreateTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class VolumeCreateTest(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(VolumeCreateTest, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -626,9 +623,6 @@ class VolumeCreateTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.hostports,
self.max_ld_count) = self.configs(self.xml)
def tearDown(self):
pass
def test_validate_migrate_volume(self):
self.vol.id = "46045673-41e7-44a7-9333-02f07feab04b"
self.vol.size = 10
@ -671,13 +665,14 @@ class VolumeCreateTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.extend_volume(self.vol, 10)
class BindLDTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class BindLDTest(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(BindLDTest, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -730,13 +725,14 @@ class BindLDTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self._select_leastused_poolnumber)
class BindLDTest_Snap(volume_helper.MStorageDSVDriver, unittest.TestCase):
class BindLDTest_Snap(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(BindLDTest_Snap, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -785,13 +781,14 @@ class BindLDTest_Snap(volume_helper.MStorageDSVDriver, unittest.TestCase):
self._select_volddr_poolnumber, 1)
class ExportTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class ExportTest(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(ExportTest, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -806,9 +803,6 @@ class ExportTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.get_ldset = mock_getldset
self.get_ldset.return_value = self.ldsets["LX:OpenStack0"]
def tearDown(self):
pass
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI._execute',
patch_execute)
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.view_all',
@ -958,13 +952,14 @@ class ExportTest(volume_helper.MStorageDSVDriver, unittest.TestCase):
class DeleteDSVVolume_test(volume_helper.MStorageDSVDriver,
unittest.TestCase):
test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(DeleteDSVVolume_test, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -991,13 +986,14 @@ class DeleteDSVVolume_test(volume_helper.MStorageDSVDriver,
class NonDisruptiveBackup_test(volume_helper.MStorageDSVDriver,
unittest.TestCase):
test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
@mock.patch('cinder.volume.drivers.nec.cli.MStorageISMCLI.'
'view_all', patch_view_all)
def setUp(self):
super(NonDisruptiveBackup_test, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.vol = DummyVolume()
@ -1097,11 +1093,12 @@ class NonDisruptiveBackup_test(volume_helper.MStorageDSVDriver,
self.assertTrue(ret)
class VolumeStats_test(volume_helper.MStorageDSVDriver, unittest.TestCase):
class VolumeStats_test(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
def setUp(self):
super(VolumeStats_test, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self._properties['cli_fip'] = '10.0.0.1'
@ -1117,11 +1114,12 @@ class VolumeStats_test(volume_helper.MStorageDSVDriver, unittest.TestCase):
self.assertEqual('0,1', stats.get('location_info').split(':')[1])
class Migrate_test(volume_helper.MStorageDSVDriver, unittest.TestCase):
class Migrate_test(volume_helper.MStorageDSVDriver, test.TestCase):
@mock.patch('cinder.volume.drivers.nec.volume_common.MStorageVolumeCommon.'
'_create_ismview_dir', new=mock.Mock())
def setUp(self):
super(Migrate_test, self).setUp()
self._set_config(conf.Configuration(None), 'dummy', 'dummy')
self.do_setup(None)
self.newvol = DummyVolume()