← Back to branch summary

~ubuntu-branches/ubuntu/precise/nova/precise

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/contrib/test_deferred_delete.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandleman
  • Date: 2012-03-09 13:07:19 UTC
  • mfrom: (1.1.48)
  • Revision ID: package-import@ubuntu.com-20120309130719-ytcnrxb0mj3epour
Tags: 2012.1~rc1~20120309.13261-0ubuntu1
[ Chuck Short ]
* New upstream release.
* Refreshed libvirt-console-patch again.

[ Adam Gandleman ]
* debian/patches/{ec2-fixes.patch, libvirt-console-pipe.patch}: Fix and
  refresh. Add dep3 headers from original git commits.
* debian/patches/ec2-fixes.patch: Dropped.  Merge upstream at 121537c3
* debain/{rules, nova-docs.doc}: Docs now built in doc/build/.
* debian/patches/libvirt-use-console-pipe.patch: Update use of
  instance['name'] instead of instance_name

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/contrib/test_deferred_delete.py
51
51
        self.mox.ReplayAll()
52
52
        res = self.extension._force_delete(self.fake_req, self.fake_uuid,
53
53
                                           self.fake_input_dict)
54
 
        self.mox.VerifyAll()
55
54
        self.assertEqual(res.status_int, 202)
56
55
 
57
56
    def test_force_delete_raises_conflict_on_invalid_state(self):
69
68
        self.assertRaises(webob.exc.HTTPConflict,
70
69
                self.extension._force_delete, self.fake_req, self.fake_uuid,
71
70
                self.fake_input_dict)
72
 
        self.mox.VerifyAll()
73
71
 
74
72
    def test_restore(self):
75
73
        self.mox.StubOutWithMock(compute.API, 'get')
84
82
        self.mox.ReplayAll()
85
83
        res = self.extension._restore(self.fake_req, self.fake_uuid,
86
84
                                      self.fake_input_dict)
87
 
        self.mox.VerifyAll()
88
85
        self.assertEqual(res.status_int, 202)
89
86
 
90
87
    def test_restore_raises_conflict_on_invalid_state(self):
101
98
        self.mox.ReplayAll()
102
99
        self.assertRaises(webob.exc.HTTPConflict, self.extension._restore,
103
100
                self.fake_req, self.fake_uuid, self.fake_input_dict)
104
 
        self.mox.VerifyAll()