openstack/nova
Code Issues Proposed changes

Merge "Make several ec2 API tests inherit from NoDBTestCase"

Browse Source
This commit is contained in:
Jenkins 2014-07-25 19:18:14 +00:00 committed by Gerrit Code Review
commit c54bcb863f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/api/ec2/test_api.py
View File

@ -96,7 +96,7 @@ class FakeHttplibConnection(object):
pass pass
class XmlConversionTestCase(test.TestCase): class XmlConversionTestCase(test.NoDBTestCase):
"""Unit test api xml conversion.""" """Unit test api xml conversion."""
def test_number_conversion(self): def test_number_conversion(self):
conv = ec2utils._try_convert conv = ec2utils._try_convert
@ -127,7 +127,7 @@ class XmlConversionTestCase(test.TestCase):
self.assertEqual(conv(''), '') self.assertEqual(conv(''), '')
class Ec2utilsTestCase(test.TestCase): class Ec2utilsTestCase(test.NoDBTestCase):
def test_ec2_id_to_id(self): def test_ec2_id_to_id(self):
self.assertEqual(ec2utils.ec2_id_to_id('i-0000001e'), 30) self.assertEqual(ec2utils.ec2_id_to_id('i-0000001e'), 30)
self.assertEqual(ec2utils.ec2_id_to_id('ami-1d'), 29) self.assertEqual(ec2utils.ec2_id_to_id('ami-1d'), 29)

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

@ -3098,7 +3098,7 @@ class CloudTestCase(test.TestCase):
mock_ec2_vol_id_to_uuid.assert_called_once_with(ec2_volume_id) mock_ec2_vol_id_to_uuid.assert_called_once_with(ec2_volume_id)
class CloudTestCaseNeutronProxy(test.TestCase): class CloudTestCaseNeutronProxy(test.NoDBTestCase):
def setUp(self): def setUp(self):
super(CloudTestCaseNeutronProxy, self).setUp() super(CloudTestCaseNeutronProxy, self).setUp()
cfg.CONF.set_override('security_group_api', 'neutron') cfg.CONF.set_override('security_group_api', 'neutron')

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

@ -181,7 +181,7 @@ class EC2ValidateTestCase(test.TestCase):
volume_id=ec2_id) volume_id=ec2_id)
class EC2TimestampValidationTestCase(test.TestCase): class EC2TimestampValidationTestCase(test.NoDBTestCase):
"""Test case for EC2 request timestamp validation.""" """Test case for EC2 request timestamp validation."""
def test_validate_ec2_timestamp_valid(self): def test_validate_ec2_timestamp_valid(self):