MAAS

Merge lp:~jtv/maas/refresh-model-factory-renamings into lp:~maas-committers/maas/trunk

  1. refresh-model-factory-renamings
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2931
Proposed branch: lp:~jtv/maas/refresh-model-factory-renamings
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 420 lines (+53/-53)
13 files modified
src/maasserver/api/tests/test_enlistment.py (+3/-3)
src/maasserver/api/tests/test_nodegroup.py (+3/-3)
src/maasserver/api/tests/test_nodes.py (+1/-1)
src/maasserver/models/tests/test_bootresource.py (+2/-2)
src/maasserver/models/tests/test_bootsource.py (+1/-1)
src/maasserver/models/tests/test_downloadprogress.py (+4/-4)
src/maasserver/models/tests/test_network.py (+19/-19)
src/maasserver/models/tests/test_node.py (+1/-1)
src/maasserver/models/tests/test_nodegroupinterface.py (+1/-1)
src/maasserver/models/tests/test_tag.py (+3/-3)
src/maasserver/testing/factory.py (+12/-12)
src/maasserver/tests/test_forms_downloadprogress.py (+2/-2)
src/maasserver/views/tests/test_noderesult.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/refresh-model-factory-renamings
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+233881@code.launchpad.net

Commit message

Refresh renaming of model factory methods. Branches off pre-renaming versions of trunk are still landing.

Description of the change

The compatibility stubs are still there; the rate of influx of old-style names is still high enough that we can't remove them yet without inflicting pain on developers. There will probably be one or two more of these refresh branches before we remove the stubs.

The branch also renames a few more factories with compound names. I think they're specific enough that they're not really worth their own compatibility stubs.

Once the stubs are removed it'll be less confusing to (at last!) rename getRandomMACAddress etc.

Jeroen

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/tests/test_enlistment.py'
2--- src/maasserver/api/tests/test_enlistment.py 2014-09-05 11:25:28 +0000
3+++ src/maasserver/api/tests/test_enlistment.py 2014-09-09 07:54:29 +0000
4@@ -44,7 +44,7 @@
5 """Enlistment tests."""
6 scenarios = [
7 ('anon', dict(userfactory=lambda: AnonymousUser())),
8- ('user', dict(userfactory=factory.make_user)),
9+ ('user', dict(userfactory=factory.make_User)),
10 ('admin', dict(userfactory=factory.make_admin)),
11 ]
12
13@@ -348,7 +348,7 @@
14
15 scenarios = [
16 ('anon', dict(userfactory=lambda: AnonymousUser())),
17- ('user', dict(userfactory=factory.make_user)),
18+ ('user', dict(userfactory=factory.make_User)),
19 ('admin', dict(userfactory=factory.make_admin)),
20 ]
21
22@@ -448,7 +448,7 @@
23
24 scenarios = [
25 ('anon', dict(userfactory=lambda: AnonymousUser())),
26- ('user', dict(userfactory=factory.make_user)),
27+ ('user', dict(userfactory=factory.make_User)),
28 ]
29
30 def test_POST_non_admin_creates_node_in_declared_state(self):
31
32=== modified file 'src/maasserver/api/tests/test_nodegroup.py'
33--- src/maasserver/api/tests/test_nodegroup.py 2014-09-07 23:44:35 +0000
34+++ src/maasserver/api/tests/test_nodegroup.py 2014-09-09 07:54:29 +0000
35@@ -89,7 +89,7 @@
36 MAASServerTestCase):
37 scenarios = [
38 ('anon', dict(userfactory=lambda: AnonymousUser())),
39- ('user', dict(userfactory=factory.make_user)),
40+ ('user', dict(userfactory=factory.make_User)),
41 ('admin', dict(userfactory=factory.make_admin)),
42 ]
43
44@@ -326,7 +326,7 @@
45 self.assertEqual('', progress.error)
46
47 def test_report_download_progress_updates_ongoing_download(self):
48- progress = factory.make_download_progress_incomplete()
49+ progress = factory.make_DownloadProgress_incomplete()
50 client = make_worker_client(progress.nodegroup)
51 new_bytes_downloaded = progress.bytes_downloaded + 1
52
53@@ -345,7 +345,7 @@
54 self.assertEqual(new_bytes_downloaded, progress.bytes_downloaded)
55
56 def test_report_download_progress_rejects_invalid_data(self):
57- progress = factory.make_download_progress_incomplete()
58+ progress = factory.make_DownloadProgress_incomplete()
59 client = make_worker_client(progress.nodegroup)
60
61 response = client.post(
62
63=== modified file 'src/maasserver/api/tests/test_nodes.py'
64--- src/maasserver/api/tests/test_nodes.py 2014-09-05 16:38:32 +0000
65+++ src/maasserver/api/tests/test_nodes.py 2014-09-09 07:54:29 +0000
66@@ -57,7 +57,7 @@
67 MAASServerTestCase):
68
69 scenarios = [
70- ('user', dict(userfactory=factory.make_user)),
71+ ('user', dict(userfactory=factory.make_User)),
72 ('admin', dict(userfactory=factory.make_admin)),
73 ]
74
75
76=== modified file 'src/maasserver/models/tests/test_bootresource.py'
77--- src/maasserver/models/tests/test_bootresource.py 2014-09-05 16:38:32 +0000
78+++ src/maasserver/models/tests/test_bootresource.py 2014-09-09 07:54:29 +0000
79@@ -291,7 +291,7 @@
80 def test_validation_raises_error_on_missing_subarch(self):
81 arch = factory.make_name('arch')
82 self.assertRaises(
83- ValidationError, factory.make_boot_resource, architecture=arch)
84+ ValidationError, factory.make_BootResource, architecture=arch)
85
86 def test_validation_raises_error_on_invalid_name_for_synced(self):
87 name = factory.make_name('name')
88@@ -331,7 +331,7 @@
89 name=name, architecture=arch)
90 self.assertRaises(
91 ValidationError,
92- factory.make_boot_resource,
93+ factory.make_BootResource,
94 rtype=BOOT_RESOURCE_TYPE.GENERATED, name=name, architecture=arch)
95
96 def test_display_rtype(self):
97
98=== modified file 'src/maasserver/models/tests/test_bootsource.py'
99--- src/maasserver/models/tests/test_bootsource.py 2014-09-05 16:38:32 +0000
100+++ src/maasserver/models/tests/test_bootsource.py 2014-09-09 07:54:29 +0000
101@@ -36,7 +36,7 @@
102 def test_url_is_unqiue(self):
103 boot_source = factory.make_BootSource()
104 self.assertRaises(
105- ValidationError, factory.make_boot_source, url=boot_source.url)
106+ ValidationError, factory.make_BootSource, url=boot_source.url)
107
108 def test_cannot_set_keyring_data_and_filename(self):
109 # A BootSource cannot have both a keyring filename and keyring
110
111=== modified file 'src/maasserver/models/tests/test_downloadprogress.py'
112--- src/maasserver/models/tests/test_downloadprogress.py 2014-09-05 16:38:32 +0000
113+++ src/maasserver/models/tests/test_downloadprogress.py 2014-09-09 07:54:29 +0000
114@@ -83,12 +83,12 @@
115 def test_rejects_negative_size(self):
116 self.assertRaises(
117 ValidationError,
118- factory.make_download_progress, size=-1, bytes_downloaded=0)
119+ factory.make_DownloadProgress, size=-1, bytes_downloaded=0)
120
121 def test_rejects_negative_bytes_downloaded(self):
122 self.assertRaises(
123 ValidationError,
124- factory.make_download_progress, bytes_downloaded=-1)
125+ factory.make_DownloadProgress, bytes_downloaded=-1)
126
127 def test_accepts_zero_bytes_downloaded(self):
128 progress = factory.make_DownloadProgress(bytes_downloaded=0)
129@@ -103,9 +103,9 @@
130 def test_rejects_bytes_downloaded_in_excess_of_size(self):
131 self.assertRaises(
132 ValidationError,
133- factory.make_download_progress, size=1000, bytes_downloaded=1001)
134+ factory.make_DownloadProgress, size=1000, bytes_downloaded=1001)
135
136 def test_accepts_any_bytes_downloaded_if_size_unknown(self):
137- progress = factory.make_download_progress_incomplete(size=None)
138+ progress = factory.make_DownloadProgress_incomplete(size=None)
139 self.assertIsNone(progress.size)
140 self.assertGreater(progress.bytes_downloaded, 0)
141
142=== modified file 'src/maasserver/models/tests/test_network.py'
143--- src/maasserver/models/tests/test_network.py 2014-09-05 16:38:32 +0000
144+++ src/maasserver/models/tests/test_network.py 2014-09-09 07:54:29 +0000
145@@ -251,7 +251,7 @@
146
147 def test_reserved_vlan_tag_does_not_validate(self):
148 error = self.assertRaises(
149- ValidationError, factory.make_network, vlan_tag=0xFFF)
150+ ValidationError, factory.make_Network, vlan_tag=0xFFF)
151 self.assertEqual(
152 error.message_dict,
153 {'vlan_tag': ["Cannot use reserved value 0xFFF."]})
154@@ -260,12 +260,12 @@
155 out_of_range_msg = (
156 "Value must be between 0x000 and 0xFFF (12 bits)")
157 error = self.assertRaises(
158- ValidationError, factory.make_network, vlan_tag=0x1000)
159+ ValidationError, factory.make_Network, vlan_tag=0x1000)
160 self.assertEqual(
161 error.message_dict, {'vlan_tag': [out_of_range_msg]})
162
163 error = self.assertRaises(
164- ValidationError, factory.make_network, vlan_tag=-1)
165+ ValidationError, factory.make_Network, vlan_tag=-1)
166 self.assertEqual(
167 error.message_dict, {'vlan_tag': [out_of_range_msg]})
168
169@@ -276,7 +276,7 @@
170 tag = factory.make_vlan_tag(allow_none=False)
171 factory.make_Network(vlan_tag=tag)
172 error = self.assertRaises(
173- ValidationError, factory.make_network, vlan_tag=tag)
174+ ValidationError, factory.make_Network, vlan_tag=tag)
175 self.assertEqual(
176 error.message_dict,
177 {'vlan_tag': ['Network with this Vlan tag already exists.']})
178@@ -322,11 +322,11 @@
179 self.assertEqual(name, factory.make_Network(name=name).name)
180
181 def test_name_validation_disallows_special_characters(self):
182- self.assertRaises(ValidationError, factory.make_network, name='a/b')
183- self.assertRaises(ValidationError, factory.make_network, name='a@b')
184- self.assertRaises(ValidationError, factory.make_network, name='a?b')
185- self.assertRaises(ValidationError, factory.make_network, name='a\\b')
186- self.assertRaises(ValidationError, factory.make_network, name='a@b')
187+ self.assertRaises(ValidationError, factory.make_Network, name='a/b')
188+ self.assertRaises(ValidationError, factory.make_Network, name='a@b')
189+ self.assertRaises(ValidationError, factory.make_Network, name='a?b')
190+ self.assertRaises(ValidationError, factory.make_Network, name='a\\b')
191+ self.assertRaises(ValidationError, factory.make_Network, name='a@b')
192
193 def test_netmask_validation_accepts_netmask(self):
194 netmask = '255.255.255.128'
195@@ -338,30 +338,30 @@
196 def test_netmask_validation_does_not_allow_extreme_cases(self):
197 ip = factory.getRandomIPAddress()
198 self.assertRaises(
199- ValidationError, factory.make_network,
200+ ValidationError, factory.make_Network,
201 network=make_network(ip, '255.255.255.255'))
202 self.assertRaises(
203- ValidationError, factory.make_network,
204+ ValidationError, factory.make_Network,
205 network=make_network(ip, '0.0.0.0'))
206
207 def test_netmask_validation_does_not_allow_too_small_ipv6_netmask(self):
208 ip = factory.make_ipv6_address()
209 self.assertRaises(
210- ValidationError, factory.make_network,
211+ ValidationError, factory.make_Network,
212 network=make_network(
213 ip, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'))
214
215 def test_netmask_validation_does_not_allow_too_large_ipv6_netmask(self):
216 ip = factory.make_ipv6_address()
217 self.assertRaises(
218- ValidationError, factory.make_network,
219+ ValidationError, factory.make_Network,
220 network=make_network(
221 ip, '0000:0000:0000:0000:0000:0000:0000:0000'))
222
223 def test_netmask_valid_doesnt_allow_short_allow_all_ipv6_netmask(self):
224 ip = factory.make_ipv6_address()
225 self.assertRaises(
226- ValidationError, factory.make_network,
227+ ValidationError, factory.make_Network,
228 network=make_network(ip, '::'))
229
230 def test_netmask_validation_does_not_allow_mixed_zeroes_and_ones(self):
231@@ -415,7 +415,7 @@
232 def test_disallows_identical_networks_with_same_netmask(self):
233 existing_network = factory.make_Network()
234 self.assertRaises(
235- ValidationError, factory.make_network,
236+ ValidationError, factory.make_Network,
237 network=existing_network.get_network())
238
239 def test_unique_network_validation_check_doesnt_use_name(self):
240@@ -429,20 +429,20 @@
241 def test_disallows_identical_networks_with_different_netmasks(self):
242 factory.make_Network(network=IPNetwork('10.0.0.0/16'))
243 self.assertRaises(
244- ValidationError, factory.make_network,
245+ ValidationError, factory.make_Network,
246 network=IPNetwork('10.0.0.0/8'))
247 self.assertRaises(
248- ValidationError, factory.make_network,
249+ ValidationError, factory.make_Network,
250 network=IPNetwork('10.0.0.0/24'))
251
252 def test_disallows_same_network_specified_using_different_addresses(self):
253 factory.make_Network(network=IPNetwork('10.1.2.3/16'))
254 self.assertRaises(
255- ValidationError, factory.make_network,
256+ ValidationError, factory.make_Network,
257 network=IPNetwork('10.1.0.0/16'))
258
259 def test_disallows_nested_networks_with_different_base_addresses(self):
260 factory.make_Network(network=IPNetwork('10.0.0.0/16'))
261 self.assertRaises(
262- ValidationError, factory.make_network,
263+ ValidationError, factory.make_Network,
264 network=IPNetwork('10.0.1.0/24'))
265
266=== modified file 'src/maasserver/models/tests/test_node.py'
267--- src/maasserver/models/tests/test_node.py 2014-09-05 16:38:32 +0000
268+++ src/maasserver/models/tests/test_node.py 2014-09-09 07:54:29 +0000
269@@ -231,7 +231,7 @@
270 bad_hostname = '-_?!@*-'
271 self.assertRaises(
272 ValidationError,
273- factory.make_node, hostname=bad_hostname)
274+ factory.make_Node, hostname=bad_hostname)
275
276 def test_work_queue_returns_nodegroup_uuid(self):
277 nodegroup = factory.make_NodeGroup()
278
279=== modified file 'src/maasserver/models/tests/test_nodegroupinterface.py'
280--- src/maasserver/models/tests/test_nodegroupinterface.py 2014-09-05 11:34:20 +0000
281+++ src/maasserver/models/tests/test_nodegroupinterface.py 2014-09-09 07:54:29 +0000
282@@ -106,7 +106,7 @@
283 cluster = factory.make_NodeGroup()
284 self.assertRaises(
285 ValidationError,
286- factory.make_node_group_interface, cluster, name='eth 0')
287+ factory.make_NodeGroupInterface, cluster, name='eth 0')
288
289 def test_clean_ips_in_network_validates_IP(self):
290 network = IPNetwork('192.168.0.3/24')
291
292=== modified file 'src/maasserver/models/tests/test_tag.py'
293--- src/maasserver/models/tests/test_tag.py 2014-09-05 16:38:32 +0000
294+++ src/maasserver/models/tests/test_tag.py 2014-09-09 07:54:29 +0000
295@@ -23,7 +23,7 @@
296
297 class TagTest(MAASServerTestCase):
298
299- def test_factory_make_tag(self):
300+ def test_factory_make_Tag(self):
301 """
302 The generated system_id looks good.
303
304@@ -36,7 +36,7 @@
305 self.assertIsNot(None, tag.updated)
306 self.assertIsNot(None, tag.created)
307
308- def test_factory_make_tag_with_hardware_details(self):
309+ def test_factory_make_Tag_with_hardware_details(self):
310 tag = factory.make_Tag('a-tag', 'true', kernel_opts="console=ttyS0")
311 self.assertEqual('a-tag', tag.name)
312 self.assertEqual('true', tag.definition)
313@@ -62,7 +62,7 @@
314 for invalid in ['invalid:name', 'no spaces', 'no\ttabs',
315 'no&ampersand', 'no!shouting', '',
316 'too-long' * 33, '\xb5']:
317- self.assertRaises(ValidationError, factory.make_tag, name=invalid)
318+ self.assertRaises(ValidationError, factory.make_Tag, name=invalid)
319
320 def test_applies_tags_to_nodes(self):
321 node1 = factory.make_Node()
322
323=== modified file 'src/maasserver/testing/factory.py'
324--- src/maasserver/testing/factory.py 2014-09-07 23:41:08 +0000
325+++ src/maasserver/testing/factory.py 2014-09-09 07:54:29 +0000
326@@ -744,7 +744,7 @@
327 """Create a `DownloadProgress` in some poorly-defined state.
328
329 If you have specific wishes about the object's state, you'll want to
330- use one of the specialized `make_download_progress_*` methods instead.
331+ use one of the specialized `make_DownloadProgress_*` methods instead.
332
333 Pass a `size` of `None` to indicate that total file size is not yet
334 known. The default picks either a random number, or None.
335@@ -778,15 +778,15 @@
336
337 make_download_progress = make_DownloadProgress # DEPRECATED
338
339- def make_download_progress_initial(self, nodegroup=None, filename=None,
340- size=NO_VALUE):
341+ def make_DownloadProgress_initial(self, nodegroup=None, filename=None,
342+ size=NO_VALUE):
343 """Create a `DownloadProgress` as reported before a download."""
344 return self.make_DownloadProgress(
345 nodegroup=nodegroup, filename=filename, size=size,
346 bytes_downloaded=None, error='')
347
348- def make_download_progress_success(self, nodegroup=None, filename=None,
349- size=None):
350+ def make_DownloadProgress_success(self, nodegroup=None, filename=None,
351+ size=None):
352 """Create a `DownloadProgress` indicating success."""
353 if size is None:
354 size = random.randint(0, 1000000000)
355@@ -794,9 +794,9 @@
356 nodegroup=nodegroup, filename=filename, size=size,
357 bytes_downloaded=size, error='')
358
359- def make_download_progress_incomplete(self, nodegroup=None, filename=None,
360- size=NO_VALUE,
361- bytes_downloaded=None):
362+ def make_DownloadProgress_incomplete(self, nodegroup=None, filename=None,
363+ size=NO_VALUE,
364+ bytes_downloaded=None):
365 """Create a `DownloadProgress` that's not done yet."""
366 if size is NO_VALUE:
367 if self.pick_bool():
368@@ -814,13 +814,13 @@
369 nodegroup=nodegroup, filename=filename, size=size,
370 bytes_downloaded=bytes_downloaded, error='')
371
372- def make_download_progress_failure(self, nodegroup=None, filename=None,
373- size=NO_VALUE,
374- bytes_downloaded=NO_VALUE, error=None):
375+ def make_DownloadProgress_failure(self, nodegroup=None, filename=None,
376+ size=NO_VALUE,
377+ bytes_downloaded=NO_VALUE, error=None):
378 """Create a `DownloadProgress` indicating failure."""
379 if error is None:
380 error = self.make_string()
381- return self.make_download_progress_incomplete(
382+ return self.make_DownloadProgress_incomplete(
383 nodegroup=nodegroup, filename=filename, size=size,
384 bytes_downloaded=bytes_downloaded, error=error)
385
386
387=== modified file 'src/maasserver/tests/test_forms_downloadprogress.py'
388--- src/maasserver/tests/test_forms_downloadprogress.py 2014-09-05 11:25:28 +0000
389+++ src/maasserver/tests/test_forms_downloadprogress.py 2014-09-09 07:54:29 +0000
390@@ -23,7 +23,7 @@
391 class TestDownloadProgressForm(MAASServerTestCase):
392
393 def test_updates_instance(self):
394- progress = factory.make_download_progress_incomplete(size=None)
395+ progress = factory.make_DownloadProgress_incomplete(size=None)
396 new_bytes_downloaded = progress.bytes_downloaded + 1
397 size = progress.bytes_downloaded + 2
398 error = factory.make_string()
399@@ -50,7 +50,7 @@
400 self.assertFalse(form.is_valid())
401
402 def test_get_download_returns_ongoing_download(self):
403- progress = factory.make_download_progress_incomplete()
404+ progress = factory.make_DownloadProgress_incomplete()
405
406 self.assertEqual(
407 progress,
408
409=== modified file 'src/maasserver/views/tests/test_noderesult.py'
410--- src/maasserver/views/tests/test_noderesult.py 2014-09-08 03:52:17 +0000
411+++ src/maasserver/views/tests/test_noderesult.py 2014-09-09 07:54:29 +0000
412@@ -353,7 +353,7 @@
413
414 def test_does_not_list_installation_results(self):
415 self.client_log_in(as_admin=True)
416- factory.make_node_install_result()
417+ factory.make_NodeResult_for_installing()
418 content = self.request_page()
419 self.assertIsNotNone(
420 get_one(content.cssselect('#no_results')))