OpenStack Compute (nova)

Merge lp:~jshepher/nova/pylint-test-servers-naming-scheme into lp:~hudson-openstack/nova/trunk

  1. pylint-test-servers-naming-scheme
  2. Merge into trunk
Proposed by Justin Shepherd
Status: Merged
Approved by: Rick Harris
Approved revision: 1074
Merged at revision: 1073
Proposed branch: lp:~jshepher/nova/pylint-test-servers-naming-scheme
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 303 lines (+49/-49)
1 file modified
nova/tests/api/openstack/test_servers.py (+49/-49)
To merge this branch: bzr merge lp:~jshepher/nova/pylint-test-servers-naming-scheme
Reviewer Review Type Date Requested Status
Rick Harris (community) Approve
Devin Carlen (community) Approve
Review via email: mp+61011@code.launchpad.net

Commit message

renamed test cases in nova/tests/api/openstack/test_servers.py to use a consistent naming convention as used in nova/tests/api/openstack/test_images.py. also fixed a couple of pylint #C0103 errors in test_servers.py.

Description of the change

renamed test cases in nova/tests/api/openstack/test_servers.py to use a consistent naming convention as used in nova/tests/api/openstack/test_images.py. also fixed a couple of pylint #C0103 errors in test_servers.py.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Rick Harris (rconradharris) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/tests/api/openstack/test_servers.py'
2--- nova/tests/api/openstack/test_servers.py 2011-05-06 18:47:47 +0000
3+++ nova/tests/api/openstack/test_servers.py 2011-05-15 04:09:27 +0000
4@@ -183,7 +183,7 @@
5 self.assertEqual(res_dict['server']['id'], 1)
6 self.assertEqual(res_dict['server']['name'], 'server1')
7
8- def test_get_server_by_id_v11(self):
9+ def test_get_server_by_id_v1_1(self):
10 req = webob.Request.blank('/v1.1/servers/1')
11 res = req.get_response(fakes.wsgi_app())
12 res_dict = json.loads(res.body)
13@@ -246,7 +246,7 @@
14 self.assertEqual(len(addresses["private"]), 1)
15 self.assertEqual(addresses["private"][0], private)
16
17- def test_get_server_addresses_V10(self):
18+ def test_get_server_addresses_v1_0(self):
19 private = '192.168.0.3'
20 public = ['1.2.3.4']
21 new_return_server = return_server_with_addresses(private, public)
22@@ -257,7 +257,7 @@
23 self.assertEqual(res_dict, {
24 'addresses': {'public': public, 'private': [private]}})
25
26- def test_get_server_addresses_xml_V10(self):
27+ def test_get_server_addresses_xml_v1_0(self):
28 private_expected = "192.168.0.3"
29 public_expected = ["1.2.3.4"]
30 new_return_server = return_server_with_addresses(private_expected,
31@@ -276,7 +276,7 @@
32 (ip,) = private.getElementsByTagName('ip')
33 self.assertEquals(ip.getAttribute('addr'), private_expected)
34
35- def test_get_server_addresses_public_V10(self):
36+ def test_get_server_addresses_public_v1_0(self):
37 private = "192.168.0.3"
38 public = ["1.2.3.4"]
39 new_return_server = return_server_with_addresses(private, public)
40@@ -286,7 +286,7 @@
41 res_dict = json.loads(res.body)
42 self.assertEqual(res_dict, {'public': public})
43
44- def test_get_server_addresses_private_V10(self):
45+ def test_get_server_addresses_private_v1_0(self):
46 private = "192.168.0.3"
47 public = ["1.2.3.4"]
48 new_return_server = return_server_with_addresses(private, public)
49@@ -296,7 +296,7 @@
50 res_dict = json.loads(res.body)
51 self.assertEqual(res_dict, {'private': [private]})
52
53- def test_get_server_addresses_public_xml_V10(self):
54+ def test_get_server_addresses_public_xml_v1_0(self):
55 private = "192.168.0.3"
56 public = ["1.2.3.4"]
57 new_return_server = return_server_with_addresses(private, public)
58@@ -310,7 +310,7 @@
59 (ip,) = public_node.getElementsByTagName('ip')
60 self.assertEquals(ip.getAttribute('addr'), public[0])
61
62- def test_get_server_addresses_private_xml_V10(self):
63+ def test_get_server_addresses_private_xml_v1_0(self):
64 private = "192.168.0.3"
65 public = ["1.2.3.4"]
66 new_return_server = return_server_with_addresses(private, public)
67@@ -324,7 +324,7 @@
68 (ip,) = private_node.getElementsByTagName('ip')
69 self.assertEquals(ip.getAttribute('addr'), private)
70
71- def test_get_server_by_id_with_addresses_v11(self):
72+ def test_get_server_by_id_with_addresses_v1_1(self):
73 private = "192.168.0.3"
74 public = ["1.2.3.4"]
75 new_return_server = return_server_with_addresses(private, public)
76@@ -354,7 +354,7 @@
77 self.assertEqual(s.get('imageId', None), None)
78 i += 1
79
80- def test_get_server_list_v11(self):
81+ def test_get_server_list_v1_1(self):
82 req = webob.Request.blank('/v1.1/servers')
83 res = req.get_response(fakes.wsgi_app())
84 res_dict = json.loads(res.body)
85@@ -576,16 +576,16 @@
86 res = req.get_response(fakes.wsgi_app())
87 self.assertEqual(res.status_int, 400)
88
89- def test_create_instance_v11(self):
90+ def test_create_instance_v1_1(self):
91 self._setup_for_create_instance()
92
93- imageRef = 'http://localhost/v1.1/images/2'
94- flavorRef = 'http://localhost/v1.1/flavors/3'
95+ image_ref = 'http://localhost/v1.1/images/2'
96+ flavor_ref = 'http://localhost/v1.1/flavors/3'
97 body = {
98 'server': {
99 'name': 'server_test',
100- 'imageRef': imageRef,
101- 'flavorRef': flavorRef,
102+ 'imageRef': image_ref,
103+ 'flavorRef': flavor_ref,
104 'metadata': {
105 'hello': 'world',
106 'open': 'stack',
107@@ -605,17 +605,17 @@
108 self.assertEqual(16, len(server['adminPass']))
109 self.assertEqual('server_test', server['name'])
110 self.assertEqual(1, server['id'])
111- self.assertEqual(flavorRef, server['flavorRef'])
112- self.assertEqual(imageRef, server['imageRef'])
113+ self.assertEqual(flavor_ref, server['flavorRef'])
114+ self.assertEqual(image_ref, server['imageRef'])
115 self.assertEqual(res.status_int, 200)
116
117- def test_create_instance_v11_bad_href(self):
118+ def test_create_instance_v1_1_bad_href(self):
119 self._setup_for_create_instance()
120
121- imageRef = 'http://localhost/v1.1/images/asdf'
122- flavorRef = 'http://localhost/v1.1/flavors/3'
123+ image_ref = 'http://localhost/v1.1/images/asdf'
124+ flavor_ref = 'http://localhost/v1.1/flavors/3'
125 body = dict(server=dict(
126- name='server_test', imageRef=imageRef, flavorRef=flavorRef,
127+ name='server_test', imageRef=image_ref, flavorRef=flavor_ref,
128 metadata={'hello': 'world', 'open': 'stack'},
129 personality={}))
130 req = webob.Request.blank('/v1.1/servers')
131@@ -625,17 +625,17 @@
132 res = req.get_response(fakes.wsgi_app())
133 self.assertEqual(res.status_int, 400)
134
135- def test_create_instance_v11_local_href(self):
136+ def test_create_instance_v1_1_local_href(self):
137 self._setup_for_create_instance()
138
139- imageRef = 'http://localhost/v1.1/images/2'
140- imageRefLocal = '2'
141- flavorRef = 'http://localhost/v1.1/flavors/3'
142+ image_ref = 'http://localhost/v1.1/images/2'
143+ image_ref_local = '2'
144+ flavor_ref = 'http://localhost/v1.1/flavors/3'
145 body = {
146 'server': {
147 'name': 'server_test',
148- 'imageRef': imageRefLocal,
149- 'flavorRef': flavorRef,
150+ 'imageRef': image_ref_local,
151+ 'flavorRef': flavor_ref,
152 },
153 }
154
155@@ -648,11 +648,11 @@
156
157 server = json.loads(res.body)['server']
158 self.assertEqual(1, server['id'])
159- self.assertEqual(flavorRef, server['flavorRef'])
160- self.assertEqual(imageRef, server['imageRef'])
161+ self.assertEqual(flavor_ref, server['flavorRef'])
162+ self.assertEqual(image_ref, server['imageRef'])
163 self.assertEqual(res.status_int, 200)
164
165- def test_create_instance_with_admin_pass_v10(self):
166+ def test_create_instance_with_admin_pass_v1_0(self):
167 self._setup_for_create_instance()
168
169 body = {
170@@ -673,16 +673,16 @@
171 self.assertNotEqual(res['server']['adminPass'],
172 body['server']['adminPass'])
173
174- def test_create_instance_with_admin_pass_v11(self):
175+ def test_create_instance_with_admin_pass_v1_1(self):
176 self._setup_for_create_instance()
177
178- imageRef = 'http://localhost/v1.1/images/2'
179- flavorRef = 'http://localhost/v1.1/flavors/3'
180+ image_ref = 'http://localhost/v1.1/images/2'
181+ flavor_ref = 'http://localhost/v1.1/flavors/3'
182 body = {
183 'server': {
184 'name': 'server_test',
185- 'imageRef': imageRef,
186- 'flavorRef': flavorRef,
187+ 'imageRef': image_ref,
188+ 'flavorRef': flavor_ref,
189 'adminPass': 'testpass',
190 },
191 }
192@@ -695,16 +695,16 @@
193 server = json.loads(res.body)['server']
194 self.assertEqual(server['adminPass'], body['server']['adminPass'])
195
196- def test_create_instance_with_empty_admin_pass_v11(self):
197+ def test_create_instance_with_empty_admin_pass_v1_1(self):
198 self._setup_for_create_instance()
199
200- imageRef = 'http://localhost/v1.1/images/2'
201- flavorRef = 'http://localhost/v1.1/flavors/3'
202+ image_ref = 'http://localhost/v1.1/images/2'
203+ flavor_ref = 'http://localhost/v1.1/flavors/3'
204 body = {
205 'server': {
206 'name': 'server_test',
207- 'imageRef': imageRef,
208- 'flavorRef': flavorRef,
209+ 'imageRef': image_ref,
210+ 'flavorRef': flavor_ref,
211 'adminPass': '',
212 },
213 }
214@@ -758,7 +758,7 @@
215 res = req.get_response(fakes.wsgi_app())
216 self.assertEqual(res.status_int, 400)
217
218- def test_update_server_v10(self):
219+ def test_update_server_v1_0(self):
220 inst_dict = dict(name='server_test', adminPass='bacon')
221 self.body = json.dumps(dict(server=inst_dict))
222
223@@ -781,7 +781,7 @@
224 res = req.get_response(fakes.wsgi_app())
225 self.assertEqual(res.status_int, 204)
226
227- def test_update_server_adminPass_ignored_v11(self):
228+ def test_update_server_adminPass_ignored_v1_1(self):
229 inst_dict = dict(name='server_test', adminPass='bacon')
230 self.body = json.dumps(dict(server=inst_dict))
231
232@@ -822,7 +822,7 @@
233 res = req.get_response(fakes.wsgi_app())
234 self.assertEqual(res.status_int, 501)
235
236- def test_server_backup_schedule_deprecated_v11(self):
237+ def test_server_backup_schedule_deprecated_v1_1(self):
238 req = webob.Request.blank('/v1.1/servers/1/backup_schedule')
239 res = req.get_response(fakes.wsgi_app())
240 self.assertEqual(res.status_int, 404)
241@@ -1113,7 +1113,7 @@
242 res = req.get_response(fakes.wsgi_app())
243 self.assertEqual(res.status_int, 400)
244
245- def test_server_rebuild_accepted_minimum_v11(self):
246+ def test_server_rebuild_accepted_minimum_v1_1(self):
247 body = {
248 "rebuild": {
249 "imageRef": "http://localhost/images/2",
250@@ -1128,7 +1128,7 @@
251 res = req.get_response(fakes.wsgi_app())
252 self.assertEqual(res.status_int, 202)
253
254- def test_server_rebuild_rejected_when_building_v11(self):
255+ def test_server_rebuild_rejected_when_building_v1_1(self):
256 body = {
257 "rebuild": {
258 "imageRef": "http://localhost/images/2",
259@@ -1147,7 +1147,7 @@
260 res = req.get_response(fakes.wsgi_app())
261 self.assertEqual(res.status_int, 409)
262
263- def test_server_rebuild_accepted_with_metadata_v11(self):
264+ def test_server_rebuild_accepted_with_metadata_v1_1(self):
265 body = {
266 "rebuild": {
267 "imageRef": "http://localhost/images/2",
268@@ -1165,7 +1165,7 @@
269 res = req.get_response(fakes.wsgi_app())
270 self.assertEqual(res.status_int, 202)
271
272- def test_server_rebuild_accepted_with_bad_metadata_v11(self):
273+ def test_server_rebuild_accepted_with_bad_metadata_v1_1(self):
274 body = {
275 "rebuild": {
276 "imageRef": "http://localhost/images/2",
277@@ -1181,7 +1181,7 @@
278 res = req.get_response(fakes.wsgi_app())
279 self.assertEqual(res.status_int, 400)
280
281- def test_server_rebuild_bad_entity_v11(self):
282+ def test_server_rebuild_bad_entity_v1_1(self):
283 body = {
284 "rebuild": {
285 "imageId": 2,
286@@ -1196,7 +1196,7 @@
287 res = req.get_response(fakes.wsgi_app())
288 self.assertEqual(res.status_int, 400)
289
290- def test_server_rebuild_bad_personality_v11(self):
291+ def test_server_rebuild_bad_personality_v1_1(self):
292 body = {
293 "rebuild": {
294 "imageRef": "http://localhost/images/2",
295@@ -1215,7 +1215,7 @@
296 res = req.get_response(fakes.wsgi_app())
297 self.assertEqual(res.status_int, 400)
298
299- def test_server_rebuild_personality_v11(self):
300+ def test_server_rebuild_personality_v1_1(self):
301 body = {
302 "rebuild": {
303 "imageRef": "http://localhost/images/2",