← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/image/test_glance.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/image/test_glance.py
28
28
from nova import test
29
29
from nova.tests.api.openstack import fakes
30
30
from nova.tests.glance import stubs as glance_stubs
 
31
from nova.tests import matchers
31
32
 
32
33
 
33
34
class NullWriter(object):
155
156
            'properties': {'instance_id': '42', 'user_id': 'fake'},
156
157
            'owner': None,
157
158
        }
158
 
        self.assertDictMatch(image_meta, expected)
 
159
        self.assertThat(image_meta, matchers.DictMatches(expected))
159
160
 
160
161
        image_metas = self.service.detail(self.context)
161
 
        self.assertDictMatch(image_metas[0], expected)
 
162
        self.assertThat(image_metas[0], matchers.DictMatches(expected))
162
163
 
163
164
    def test_create_without_instance_id(self):
164
165
        """
188
189
            'owner': None,
189
190
        }
190
191
        actual = self.service.show(self.context, image_id)
191
 
        self.assertDictMatch(actual, expected)
 
192
        self.assertThat(actual, matchers.DictMatches(expected))
192
193
 
193
194
    def test_create(self):
194
195
        fixture = self._make_fixture(name='test image')
259
260
                'owner': None,
260
261
            }
261
262
 
262
 
            self.assertDictMatch(meta, expected)
 
263
            self.assertThat(meta, matchers.DictMatches(expected))
263
264
            i = i + 1
264
265
 
265
266
    def test_detail_limit(self):
315
316
                'deleted': None,
316
317
                'owner': None,
317
318
            }
318
 
            self.assertDictMatch(meta, expected)
 
319
            self.assertThat(meta, matchers.DictMatches(expected))
319
320
            i = i + 1
320
321
 
321
322
    def test_detail_invalid_marker(self):