Fix cinderclient traces in tests

Change-Id: Ia276ef556aa4633baa0b0a1898c2748d2e53b655
Closes-bug: 1497142
This commit is contained in:
Matthias Runge 2015-09-18 12:38:26 +02:00
parent 4db373f6a2
commit 65be1e33a8

View File

@ -661,6 +661,7 @@ class VolumeViewTests(test.TestCase):
self.assertFormError(res, 'form', None, msg) self.assertFormError(res, 'form', None, msg)
@test.create_stubs({cinder: ('volume_type_list', @test.create_stubs({cinder: ('volume_type_list',
'volume_type_default',
'availability_zone_list', 'availability_zone_list',
'extension_supported'), 'extension_supported'),
api.glance: ('image_get', api.glance: ('image_get',
@ -680,6 +681,8 @@ class VolumeViewTests(test.TestCase):
AndReturn(self.volume_types.list()) AndReturn(self.volume_types.list())
cinder.volume_type_list(IsA(http.HttpRequest)).\ cinder.volume_type_list(IsA(http.HttpRequest)).\
AndReturn(self.volume_types.list()) AndReturn(self.volume_types.list())
cinder.volume_type_default(IsA(http.HttpRequest)).\
AndReturn(self.volume_types.first())
quotas.tenant_limit_usages(IsA(http.HttpRequest)).\ quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
AndReturn(usage_limit) AndReturn(usage_limit)
api.glance.image_get(IsA(http.HttpRequest), api.glance.image_get(IsA(http.HttpRequest),
@ -771,6 +774,7 @@ class VolumeViewTests(test.TestCase):
self.assertEqual(res.context['form'].errors['__all__'], expected_error) self.assertEqual(res.context['form'].errors['__all__'], expected_error)
@test.create_stubs({cinder: ('volume_snapshot_list', @test.create_stubs({cinder: ('volume_snapshot_list',
'volume_type_default',
'volume_type_list', 'volume_type_list',
'volume_list', 'volume_list',
'availability_zone_list', 'availability_zone_list',
@ -791,6 +795,8 @@ class VolumeViewTests(test.TestCase):
AndReturn(self.volume_types.list()) AndReturn(self.volume_types.list())
cinder.volume_type_list(IsA(http.HttpRequest)).\ cinder.volume_type_list(IsA(http.HttpRequest)).\
AndReturn(self.volume_types.list()) AndReturn(self.volume_types.list())
cinder.volume_type_default(IsA(http.HttpRequest)).\
AndReturn(self.volume_types.first())
quotas.tenant_limit_usages(IsA(http.HttpRequest)).\ quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
AndReturn(usage_limit) AndReturn(usage_limit)
cinder.volume_snapshot_list(IsA(http.HttpRequest), cinder.volume_snapshot_list(IsA(http.HttpRequest),