← Back to branch summary

~ubuntu-branches/ubuntu/vivid/openstack-trove/vivid

« back to all changes in this revision

Viewing changes to trove/tests/api/mgmt/storage.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant
  • Date: 2015-01-06 13:39:46 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20150106133946-fqecrqyhzcw5nj0i
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branches. 

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/p/fix-requirements: Align requirements with Ubuntu.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
trove/tests/api/mgmt/storage.py
91
91
        storage = self.client.storage.index()
92
92
        print("storage : %r" % storage)
93
93
        print("instance_info.storage : %r" % instance_info.storage)
94
 
        expected_attrs = ['name', 'type', 'used', 'provision', 'capacity']
 
94
        allowed_attrs = ['name', 'type', 'used', 'provision', 'capacity']
95
95
        for index, device in enumerate(storage):
96
 
            CheckInstance(None).attrs_exist(device._info, expected_attrs,
97
 
                                            msg="Storage")
 
96
            CheckInstance(None).contains_allowed_attrs(
 
97
                device._info,
 
98
                allowed_attrs, msg="Storage")
98
99
            asserts.assert_equal(device.name,
99
100
                                 instance_info.storage[index].name)
100
101
            asserts.assert_equal(device.used,