← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat_integrationtests/scenario/test_volumes.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-07-07 17:06:19 UTC
  • mfrom: (1.1.26) (45.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150707170619-hra2dbjpfofpou4s
Tags: 1:5.0.0~b1-0ubuntu1
[ Corey Bryant ]
* New upstream milestone for OpenStack Liberty:
  - d/control: Align (build-)depends with upstream.
  - d/p/fix-requirements.patch: Rebased.
  - d/p/sudoers_patch.patch: Rebased.

[ James Page ]
* d/s/options: Ignore any removal of egg-info data during package clean.
* d/control: Drop MySQL and PostgreSQL related BD's, not required for unit
  testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat_integrationtests/scenario/test_volumes.py
61
61
 
62
62
        # Delete the stack and ensure a backup is created for volume_id
63
63
        # but the volume itself is gone
64
 
        self.client.stacks.delete(stack_id)
65
 
        self._wait_for_stack_status(stack_id, 'DELETE_COMPLETE')
 
64
        self._stack_delete(stack_id)
66
65
        self.assertRaises(cinder_exceptions.NotFound,
67
66
                          self.volume_client.volumes.get,
68
67
                          volume_id)
97
96
                         testfile_data)
98
97
 
99
98
        # Delete the stack and ensure the volume is gone
100
 
        self.client.stacks.delete(stack_identifier2)
101
 
        self._wait_for_stack_status(stack_identifier2, 'DELETE_COMPLETE')
 
99
        self._stack_delete(stack_identifier2)
102
100
        self.assertRaises(cinder_exceptions.NotFound,
103
101
                          self.volume_client.volumes.get,
104
102
                          volume_id2)