openstack
/
glance
Code Issues Proposed changes

Fix test redifinitions 

A few testcases had duplicate names, which caused
the original test to be redefined and not executed
anymore. Also one case was apparently entirely duplicate.
Raises unit test coverage by two tests.

Change-Id: Ibf3db93b7fee875877c1bac8797eb88fc9a99874
This commit is contained in:
Dirk Mueller 2013-04-22 02:39:00 +02:00
parent 60431d8dc9
commit e6e02cd147
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance/tests/unit/test_clients.py
View File

@ -716,7 +716,7 @@ class TestRegistryClient(base.IsolatedUnitTest):
self.assertTrue(image['size'] >= 20)
def test_get_image_details_with_changes_since(self):
"""Tests that a detailed call can be filtered by size_min"""
"""Tests that a detailed call can be filtered by changes-since"""
dt1 = timeutils.utcnow() - datetime.timedelta(1)
iso1 = timeutils.isotime(dt1)
@ -740,7 +740,7 @@ class TestRegistryClient(base.IsolatedUnitTest):
'checksum': None}
db_api.image_create(self.context, extra_fixture)
db_api.image_destroy(self.context, 3)
db_api.image_destroy(self.context, UUID3)
UUID4 = _gen_uuid()
extra_fixture = {'id': UUID4,
@ -780,8 +780,8 @@ class TestRegistryClient(base.IsolatedUnitTest):
images = self.client.get_images(filters=filters)
self.assertEquals(len(images), 0)
def test_get_image_details_with_changes_since(self):
"""Tests that a detailed call can be filtered by changes-since"""
def test_get_image_details_with_size_min(self):
"""Tests that a detailed call can be filtered by size_min"""
extra_fixture = {'id': _gen_uuid(),
'status': 'saving',
'is_public': True,

23
glance/tests/unit/test_domain.py
View File

@ -89,29 +89,6 @@ class TestImageFactory(test_utils.BaseTestCase):
self.assertEqual(image.extra_properties, {'foo': 'bar'})
self.assertEqual(image.tags, set(['one', 'two']))
def test_new_image_with_extra_properties_and_tags(self):
extra_properties = {'foo': 'bar'}
tags = ['one', 'two']
image = self.image_factory.new_image(
image_id=UUID1, name='image-1',
extra_properties=extra_properties, tags=tags)
self.assertEqual(image.image_id, UUID1)
self.assertTrue(image.created_at is not None)
self.assertEqual(image.created_at, image.updated_at)
self.assertEqual(image.status, 'queued')
self.assertEqual(image.visibility, 'private')
self.assertEqual(image.owner, None)
self.assertEqual(image.name, 'image-1')
self.assertEqual(image.size, None)
self.assertEqual(image.min_disk, 0)
self.assertEqual(image.min_ram, 0)
self.assertEqual(image.protected, False)
self.assertEqual(image.disk_format, None)
self.assertEqual(image.container_format, None)
self.assertEqual(image.extra_properties, {'foo': 'bar'})
self.assertEqual(image.tags, set(['one', 'two']))
def test_new_image_read_only_property(self):
self.assertRaises(exception.ReadonlyProperty,
self.image_factory.new_image, image_id=UUID1,

2
glance/tests/unit/test_swift_store.py
View File

@ -905,7 +905,7 @@ class TestCreatingLocations(base.IsolatedUnitTest):
store = glance.store.swift.MultiTenantStore(context)
self.assertEquals(fake_get_endpoint.service_type, 'toy-store')
def test_multi_tenant_location_custom_service_type(self):
def test_multi_tenant_location_custom_endpoint_type(self):
self.config(swift_store_endpoint_type='InternalURL')
fake_get_endpoint = FakeGetEndpoint('https://some_endpoint')
self.stubs.Set(glance.common.auth, 'get_endpoint', fake_get_endpoint)