← Back to branch summary

~cerberus/nova/disk_config

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/contrib/test_diskconfig.py

  • Committer: matt.dietz at rackspace
  • Date: 2011-09-21 19:48:25 UTC
  • mfrom: (1511.1.98 nova)
  • Revision ID: matt.dietz@rackspace.com-20110921194825-zv1w4qonfh6o1j2u
Merge from trunk, updated failing tests and pep8

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/contrib/test_diskconfig.py
101
101
    NOW_API_FORMAT = "2010-10-11T10:30:22Z"
102
102
 
103
103
    def test_image_get_disk_config(self):
104
 
        self.fixtures = self._make_image_fixtures()
105
104
        self.flags(image_service='nova.image.glance.GlanceImageService')
106
 
        fakes.stub_out_glance(self.stubs, initial_fixtures=self.fixtures)
 
105
        fakes.stub_out_glance(self.stubs)
107
106
 
108
107
        def fake_image_service_show(*args, **kwargs):
109
108
            return {'properties': {'managed_disk': True}}
122
121
        self.assertEqual(int(body['image']['id']), 10)
123
122
 
124
123
    def test_image_get_disk_config_no_image_fails(self):
125
 
        self.fixtures = self._make_image_fixtures()
126
124
        self.flags(image_service='nova.image.glance.GlanceImageService')
127
 
        fakes.stub_out_glance(self.stubs, initial_fixtures=self.fixtures)
 
125
        fakes.stub_out_glance(self.stubs)
128
126
 
129
127
        def fake_image_service_show(*args, **kwargs):
130
128
            raise exception.NotFound()