← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/test_server_metadata.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman, Adam Gandelman, Chuck Short
  • Date: 2012-08-27 15:37:18 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20120827153718-lj8er44eqqz1gsrj
Tags: 2012.2~rc1~20120827.15815-0ubuntu1
https://launchpad.net/bugs/820694
[ Adam Gandelman ]
* New upstream release.

[ Chuck Short ]
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Dropped we dont run pep8 tests anymore.
* debian/control: Drop pep8 build depends
* debian/*.upstart.in: Make sure we transition correctly from runlevel
  1 to 2. (LP: #820694)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/test_server_metadata.py
84
84
            'locked': False}
85
85
 
86
86
 
87
 
def return_server_nonexistant(context, server_id):
 
87
def return_server_nonexistent(context, server_id):
88
88
    raise exception.InstanceNotFound()
89
89
 
90
90
 
124
124
        }
125
125
        self.assertEqual(expected, res_dict)
126
126
 
127
 
    def test_index_nonexistant_server(self):
 
127
    def test_index_nonexistent_server(self):
128
128
        self.stubs.Set(nova.db, 'instance_metadata_get',
129
 
                       return_server_nonexistant)
 
129
                       return_server_nonexistent)
130
130
        req = fakes.HTTPRequest.blank(self.url)
131
131
        self.assertRaises(webob.exc.HTTPNotFound,
132
132
                          self.controller.index, req, self.url)
145
145
        expected = {'meta': {'key2': 'value2'}}
146
146
        self.assertEqual(expected, res_dict)
147
147
 
148
 
    def test_show_nonexistant_server(self):
 
148
    def test_show_nonexistent_server(self):
149
149
        self.stubs.Set(nova.db, 'instance_metadata_get',
150
 
                       return_server_nonexistant)
 
150
                       return_server_nonexistent)
151
151
        req = fakes.HTTPRequest.blank(self.url + '/key2')
152
152
        self.assertRaises(webob.exc.HTTPNotFound,
153
153
                          self.controller.show, req, self.uuid, 'key2')
170
170
 
171
171
        self.assertEqual(None, res)
172
172
 
173
 
    def test_delete_nonexistant_server(self):
 
173
    def test_delete_nonexistent_server(self):
174
174
        self.stubs.Set(nova.db, 'instance_get_by_uuid',
175
 
                       return_server_nonexistant)
 
175
                       return_server_nonexistent)
176
176
        req = fakes.HTTPRequest.blank(self.url + '/key1')
177
177
        req.method = 'DELETE'
178
178
        self.assertRaises(webob.exc.HTTPNotFound,
240
240
                          self.controller.create,
241
241
                          req, self.uuid, body)
242
242
 
243
 
    def test_create_nonexistant_server(self):
 
243
    def test_create_nonexistent_server(self):
244
244
        self.stubs.Set(nova.db, 'instance_get_by_uuid',
245
 
                       return_server_nonexistant)
 
245
                       return_server_nonexistent)
246
246
        req = fakes.HTTPRequest.blank(self.url)
247
247
        req.method = 'POST'
248
248
        body = {"metadata": {"key1": "value1"}}
305
305
        self.assertRaises(webob.exc.HTTPBadRequest,
306
306
                          self.controller.update_all, req, self.uuid, expected)
307
307
 
308
 
    def test_update_all_nonexistant_server(self):
309
 
        self.stubs.Set(nova.db, 'instance_get', return_server_nonexistant)
 
308
    def test_update_all_nonexistent_server(self):
 
309
        self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)
310
310
        req = fakes.HTTPRequest.blank(self.url)
311
311
        req.method = 'PUT'
312
312
        req.content_type = "application/json"
328
328
        expected = {'meta': {'key1': 'value1'}}
329
329
        self.assertEqual(expected, res_dict)
330
330
 
331
 
    def test_update_item_nonexistant_server(self):
 
331
    def test_update_item_nonexistent_server(self):
332
332
        self.stubs.Set(nova.db, 'instance_get_by_uuid',
333
 
                       return_server_nonexistant)
 
333
                       return_server_nonexistent)
334
334
        req = fakes.HTTPRequest.blank('/v1.1/fake/servers/asdf/metadata/key1')
335
335
        req.method = 'PUT'
336
336
        body = {"meta": {"key1": "value1"}}