← Back to branch summary

~rlane/nova/lp773690

« back to all changes in this revision

Viewing changes to nova/tests/test_volume.py

  • Committer: rlane at wikimedia
  • Date: 2011-04-29 22:30:40 UTC
  • mfrom: (382.1.655 nova)
  • Revision ID: rlane@wikimedia.org-20110429223040-i0x3ds9eqwrabyru
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_volume.py
142
142
        self.assertEqual(vol['status'], "available")
143
143
 
144
144
        self.volume.delete_volume(self.context, volume_id)
145
 
        self.assertRaises(exception.Error,
 
145
        self.assertRaises(exception.VolumeNotFound,
146
146
                          db.volume_get,
147
147
                          self.context,
148
148
                          volume_id)