MAAS

Merge lp:~jtv/maas/rename-make_boot_source into lp:~maas-committers/maas/trunk

  1. rename-make_boot_source
  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: 2915
Proposed branch: lp:~jtv/maas/rename-make_boot_source
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 561 lines (+67/-67)
6 files modified
src/maasserver/api/tests/test_boot_resources.py (+18/-18)
src/maasserver/clusterrpc/tests/test_boot_images.py (+1/-1)
src/maasserver/models/tests/test_bootresource.py (+14/-14)
src/maasserver/models/tests/test_bootresourceset.py (+14/-14)
src/maasserver/models/tests/test_largefile.py (+1/-1)
src/maasserver/tests/test_bootresources.py (+19/-19)
To merge this branch: bzr merge lp:~jtv/maas/rename-make_boot_source
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+233494@code.launchpad.net

Commit message

Replace use of factory.make_boot_source with the new make_BootSource.

Description of the change

For self-approval.

Jeroen

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Looks OK. Self-approving.

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_boot_resources.py'
2--- src/maasserver/api/tests/test_boot_resources.py 2014-09-03 01:05:32 +0000
3+++ src/maasserver/api/tests/test_boot_resources.py 2014-09-05 11:18:45 +0000
4@@ -60,7 +60,7 @@
5 total_size = random.randint(1024, 2048)
6 content = factory.make_string(size)
7 largefile = factory.make_large_file(content=content, size=total_size)
8- resource = factory.make_boot_resource(
9+ resource = factory.make_BootResource(
10 rtype=BOOT_RESOURCE_TYPE.UPLOADED)
11 resource_set = factory.make_boot_resource_set(resource)
12 rfile = factory.make_boot_resource_file(resource_set, largefile)
13@@ -79,7 +79,7 @@
14 dict_representation['upload_uri'])
15
16 def test_boot_resource_set_to_dict(self):
17- resource = factory.make_boot_resource()
18+ resource = factory.make_BootResource()
19 resource_set = factory.make_boot_resource_set(resource)
20 total_size = random.randint(1024, 2048)
21 content = factory.make_string(random.randint(512, 1023))
22@@ -97,7 +97,7 @@
23 dict_representation['files'][rfile.filename])
24
25 def test_boot_resource_to_dict_without_sets(self):
26- resource = factory.make_boot_resource()
27+ resource = factory.make_BootResource()
28 factory.make_boot_resource_set(resource)
29 dict_representation = boot_resource_to_dict(resource, with_sets=False)
30 self.assertEqual(resource.id, dict_representation['id'])
31@@ -113,7 +113,7 @@
32 self.assertFalse('sets' in dict_representation)
33
34 def test_boot_resource_to_dict_with_sets(self):
35- resource = factory.make_boot_resource()
36+ resource = factory.make_BootResource()
37 resource_set = factory.make_boot_resource_set(resource)
38 dict_representation = boot_resource_to_dict(resource, with_sets=True)
39 self.assertItemsEqual(
40@@ -131,7 +131,7 @@
41
42 def test_GET_returns_boot_resources_list(self):
43 resources = [
44- factory.make_boot_resource() for _ in range(3)]
45+ factory.make_BootResource() for _ in range(3)]
46 response = self.client.get(
47 reverse('boot_resources_handler'))
48 self.assertEqual(httplib.OK, response.status_code, response.content)
49@@ -142,11 +142,11 @@
50
51 def test_GET_synced_returns_synced_boot_resources(self):
52 resources = [
53- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
54+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
55 for _ in range(3)
56 ]
57- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
58- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
59+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
60+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
61 response = self.client.get(
62 reverse('boot_resources_handler'), {'type': 'synced'})
63 self.assertEqual(httplib.OK, response.status_code, response.content)
64@@ -157,11 +157,11 @@
65
66 def test_GET_generated_returns_generated_boot_resources(self):
67 resources = [
68- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
69+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
70 for _ in range(3)
71 ]
72- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
73- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
74+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
75+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
76 response = self.client.get(
77 reverse('boot_resources_handler'), {'type': 'generated'})
78 self.assertEqual(httplib.OK, response.status_code, response.content)
79@@ -172,11 +172,11 @@
80
81 def test_GET_uploaded_returns_uploaded_boot_resources(self):
82 resources = [
83- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
84+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
85 for _ in range(3)
86 ]
87- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
88- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
89+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
90+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.GENERATED)
91 response = self.client.get(
92 reverse('boot_resources_handler'), {'type': 'uploaded'})
93 self.assertEqual(httplib.OK, response.status_code, response.content)
94@@ -186,7 +186,7 @@
95 [resource.get('id') for resource in parsed_result])
96
97 def test_GET_doesnt_include_full_definition_of_boot_resource(self):
98- factory.make_boot_resource()
99+ factory.make_BootResource()
100 response = self.client.get(
101 reverse('boot_resources_handler'))
102 self.assertEqual(httplib.OK, response.status_code, response.content)
103@@ -410,13 +410,13 @@
104
105 def test_DELETE_deletes_boot_resource(self):
106 self.become_admin()
107- resource = factory.make_boot_resource()
108+ resource = factory.make_BootResource()
109 response = self.client.delete(get_boot_resource_uri(resource))
110 self.assertEqual(httplib.NO_CONTENT, response.status_code)
111 self.assertIsNone(reload_object(resource))
112
113 def test_DELETE_requires_admin(self):
114- resource = factory.make_boot_resource()
115+ resource = factory.make_BootResource()
116 response = self.client.delete(get_boot_resource_uri(resource))
117 self.assertEqual(httplib.FORBIDDEN, response.status_code)
118
119@@ -449,7 +449,7 @@
120
121 if rtype is None:
122 rtype = BOOT_RESOURCE_TYPE.UPLOADED
123- resource = factory.make_boot_resource(rtype=rtype)
124+ resource = factory.make_BootResource(rtype=rtype)
125 resource_set = factory.make_boot_resource_set(resource)
126 rfile = factory.make_boot_resource_file(resource_set, largefile)
127 return rfile, content
128
129=== modified file 'src/maasserver/clusterrpc/tests/test_boot_images.py'
130--- src/maasserver/clusterrpc/tests/test_boot_images.py 2014-09-04 14:32:58 +0000
131+++ src/maasserver/clusterrpc/tests/test_boot_images.py 2014-09-05 11:18:45 +0000
132@@ -129,7 +129,7 @@
133 resource_arch = '%s/%s' % (
134 param['architecture'], param['subarchitecture'])
135
136- resource = factory.make_boot_resource(
137+ resource = factory.make_BootResource(
138 rtype=BOOT_RESOURCE_TYPE.SYNCED,
139 name=resource_name, architecture=resource_arch)
140 resource.extra['subarches'] = ','.join(subarches)
141
142=== modified file 'src/maasserver/models/tests/test_bootresource.py'
143--- src/maasserver/models/tests/test_bootresource.py 2014-09-04 14:32:58 +0000
144+++ src/maasserver/models/tests/test_bootresource.py 2014-09-05 11:18:45 +0000
145@@ -40,7 +40,7 @@
146 arch = factory.make_name('arch')
147 subarch = factory.make_name('subarch')
148 architecture = '%s/%s' % (arch, subarch)
149- resource = factory.make_boot_resource(
150+ resource = factory.make_BootResource(
151 rtype=rtype, name=name, architecture=architecture)
152 return resource, (arch, subarch)
153
154@@ -179,7 +179,7 @@
155 name = '%s/%s' % (os, series)
156 resource = factory.make_usable_boot_resource(
157 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name)
158- not_commissionable = factory.make_boot_resource(
159+ not_commissionable = factory.make_BootResource(
160 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name)
161 factory.make_boot_resource_set(not_commissionable)
162 commissionables = BootResource.objects.get_commissionable_resource(
163@@ -259,7 +259,7 @@
164
165 def test_get_resource_for_returns_matching_resource(self):
166 resources = [
167- factory.make_boot_resource(
168+ factory.make_BootResource(
169 rtype=random.choice(RTYPE_REQUIRING_OS_SERIES_NAME))
170 for _ in range(3)
171 ]
172@@ -326,7 +326,7 @@
173 factory.make_name('os'), factory.make_name('series'))
174 arch = '%s/%s' % (
175 factory.make_name('arch'), factory.make_name('subarch'))
176- factory.make_boot_resource(
177+ factory.make_BootResource(
178 rtype=BOOT_RESOURCE_TYPE.SYNCED,
179 name=name, architecture=arch)
180 self.assertRaises(
181@@ -343,17 +343,17 @@
182 arch = factory.make_name('arch')
183 subarch = factory.make_name('subarch')
184 architecture = '%s/%s' % (arch, subarch)
185- resource = factory.make_boot_resource(architecture=architecture)
186+ resource = factory.make_BootResource(architecture=architecture)
187 self.assertEqual([arch, subarch], resource.split_arch())
188
189 def test_get_latest_set(self):
190- resource = factory.make_boot_resource()
191+ resource = factory.make_BootResource()
192 factory.make_boot_resource_set(resource)
193 latest_two = factory.make_boot_resource_set(resource)
194 self.assertEqual(latest_two, resource.get_latest_set())
195
196 def test_get_latest_complete_set(self):
197- resource = factory.make_boot_resource()
198+ resource = factory.make_BootResource()
199 factory.make_boot_resource_set(resource)
200 self.make_complete_boot_resource_set(resource)
201 latest_complete = self.make_complete_boot_resource_set(resource)
202@@ -367,12 +367,12 @@
203
204 def test_get_next_version_name_returns_current_date(self):
205 expected_version = self.configure_now()
206- resource = factory.make_boot_resource()
207+ resource = factory.make_BootResource()
208 self.assertEqual(expected_version, resource.get_next_version_name())
209
210 def test_get_next_version_name_returns_first_revision(self):
211 expected_version = '%s.1' % self.configure_now()
212- resource = factory.make_boot_resource()
213+ resource = factory.make_BootResource()
214 factory.make_boot_resource_set(
215 resource, version=resource.get_next_version_name())
216 self.assertEqual(expected_version, resource.get_next_version_name())
217@@ -380,7 +380,7 @@
218 def test_get_next_version_name_returns_later_revision(self):
219 expected_version = self.configure_now()
220 set_count = random.randint(2, 4)
221- resource = factory.make_boot_resource()
222+ resource = factory.make_BootResource()
223 for _ in range(set_count):
224 factory.make_boot_resource_set(
225 resource, version=resource.get_next_version_name())
226@@ -392,24 +392,24 @@
227 arch = factory.make_name('arch')
228 subarch = factory.make_name('subarch')
229 architecture = '%s/%s' % (arch, subarch)
230- resource = factory.make_boot_resource(architecture=architecture)
231+ resource = factory.make_BootResource(architecture=architecture)
232 self.assertTrue(resource.supports_subarch(subarch))
233
234 def test_supports_subarch_returns_False_if_subarches_is_missing(self):
235- resource = factory.make_boot_resource()
236+ resource = factory.make_BootResource()
237 self.assertFalse(
238 resource.supports_subarch(factory.make_name('subarch')))
239
240 def test_supports_subarch_returns_True_if_subarch_in_subarches(self):
241 subarches = [factory.make_name('subarch') for _ in range(3)]
242 subarch = random.choice(subarches)
243- resource = factory.make_boot_resource(
244+ resource = factory.make_BootResource(
245 extra={'subarches': ','.join(subarches)})
246 self.assertTrue(resource.supports_subarch(subarch))
247
248 def test_supports_subarch_returns_False_if_subarch_not_in_subarches(self):
249 subarches = [factory.make_name('subarch') for _ in range(3)]
250- resource = factory.make_boot_resource(
251+ resource = factory.make_BootResource(
252 extra={'subarches': ','.join(subarches)})
253 self.assertFalse(
254 resource.supports_subarch(factory.make_name('subarch')))
255
256=== modified file 'src/maasserver/models/tests/test_bootresourceset.py'
257--- src/maasserver/models/tests/test_bootresourceset.py 2014-08-09 21:58:36 +0000
258+++ src/maasserver/models/tests/test_bootresourceset.py 2014-09-05 11:18:45 +0000
259@@ -38,13 +38,13 @@
260 resource_set, filename=filetype, filetype=filetype)
261
262 def test_commissionable_returns_true_when_all_filetypes_present(self):
263- resource = factory.make_boot_resource()
264+ resource = factory.make_BootResource()
265 resource_set = factory.make_boot_resource_set(resource)
266 self.make_all_boot_resource_files(resource_set, COMMISSIONABLE_SET)
267 self.assertTrue(resource_set.commissionable)
268
269 def test_commissionable_returns_false_when_missing_filetypes(self):
270- resource = factory.make_boot_resource()
271+ resource = factory.make_BootResource()
272 resource_set = factory.make_boot_resource_set(resource)
273 types = COMMISSIONABLE_SET.copy()
274 types.pop()
275@@ -52,13 +52,13 @@
276 self.assertFalse(resource_set.commissionable)
277
278 def test_installable_returns_true_when_all_filetypes_present(self):
279- resource = factory.make_boot_resource()
280+ resource = factory.make_BootResource()
281 resource_set = factory.make_boot_resource_set(resource)
282 self.make_all_boot_resource_files(resource_set, INSTALL_SET)
283 self.assertTrue(resource_set.installable)
284
285 def test_installable_returns_false_when_missing_filetypes(self):
286- resource = factory.make_boot_resource()
287+ resource = factory.make_BootResource()
288 resource_set = factory.make_boot_resource_set(resource)
289 types = INSTALL_SET.copy()
290 types.pop()
291@@ -66,7 +66,7 @@
292 self.assertFalse(resource_set.installable)
293
294 def test_xinstallable_returns_true_when_filetype_present(self):
295- resource = factory.make_boot_resource()
296+ resource = factory.make_BootResource()
297 resource_set = factory.make_boot_resource_set(resource)
298 filetype = random.choice(XINSTALL_TYPES)
299 factory.make_boot_resource_file_with_content(
300@@ -74,7 +74,7 @@
301 self.assertTrue(resource_set.xinstallable)
302
303 def test_xinstallable_returns_false_when_missing_filetypes(self):
304- resource = factory.make_boot_resource()
305+ resource = factory.make_BootResource()
306 resource_set = factory.make_boot_resource_set(resource)
307 filetype = random.choice(list(INSTALL_SET))
308 factory.make_boot_resource_file_with_content(
309@@ -82,7 +82,7 @@
310 self.assertFalse(resource_set.xinstallable)
311
312 def test_total_size(self):
313- resource = factory.make_boot_resource()
314+ resource = factory.make_BootResource()
315 resource_set = factory.make_boot_resource_set(resource)
316 total_size = 0
317 sizes = [random.randint(512, 1024) for _ in range(3)]
318@@ -100,7 +100,7 @@
319 self.assertEqual(total_size, resource_set.total_size)
320
321 def test_size(self):
322- resource = factory.make_boot_resource()
323+ resource = factory.make_BootResource()
324 resource_set = factory.make_boot_resource_set(resource)
325 final_size = 0
326 sizes = [random.randint(512, 1024) for _ in range(3)]
327@@ -121,7 +121,7 @@
328 self.assertEqual(final_size, resource_set.size)
329
330 def test_progress_handles_zero_division(self):
331- resource = factory.make_boot_resource()
332+ resource = factory.make_BootResource()
333 resource_set = factory.make_boot_resource_set(resource)
334 filetype = BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE
335 total_size = random.randint(1025, 2048)
336@@ -133,7 +133,7 @@
337 self.assertEqual(0, resource_set.progress)
338
339 def test_progress_increases_from_0_to_1(self):
340- resource = factory.make_boot_resource()
341+ resource = factory.make_BootResource()
342 resource_set = factory.make_boot_resource_set(resource)
343 filetype = BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE
344 total_size = 100
345@@ -153,7 +153,7 @@
346 resource_set.progress)
347
348 def test_progress_accumulates_all_files(self):
349- resource = factory.make_boot_resource()
350+ resource = factory.make_BootResource()
351 resource_set = factory.make_boot_resource_set(resource)
352 final_size = 0
353 final_total_size = 0
354@@ -178,12 +178,12 @@
355 self.assertAlmostEqual(progress, resource_set.progress)
356
357 def test_complete_returns_false_for_no_files(self):
358- resource = factory.make_boot_resource()
359+ resource = factory.make_BootResource()
360 resource_set = factory.make_boot_resource_set(resource)
361 self.assertFalse(resource_set.complete)
362
363 def test_complete_returns_false_for_one_incomplete_file(self):
364- resource = factory.make_boot_resource()
365+ resource = factory.make_BootResource()
366 resource_set = factory.make_boot_resource_set(resource)
367 types = [
368 BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE,
369@@ -204,7 +204,7 @@
370 self.assertFalse(resource_set.complete)
371
372 def test_complete_returns_true_for_complete_files(self):
373- resource = factory.make_boot_resource()
374+ resource = factory.make_BootResource()
375 resource_set = factory.make_boot_resource_set(resource)
376 types = [
377 BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE,
378
379=== modified file 'src/maasserver/models/tests/test_largefile.py'
380--- src/maasserver/models/tests/test_largefile.py 2014-09-02 21:08:26 +0000
381+++ src/maasserver/models/tests/test_largefile.py 2014-09-05 11:18:45 +0000
382@@ -127,7 +127,7 @@
383
384 def test_delete_does_nothing_if_linked(self):
385 largefile = factory.make_large_file()
386- resource = factory.make_boot_resource()
387+ resource = factory.make_BootResource()
388 resource_set = factory.make_boot_resource_set(resource)
389 factory.make_boot_resource_file(resource_set, largefile)
390 largefile.delete()
391
392=== modified file 'src/maasserver/tests/test_bootresources.py'
393--- src/maasserver/tests/test_bootresources.py 2014-09-02 15:29:58 +0000
394+++ src/maasserver/tests/test_bootresources.py 2014-09-05 11:18:45 +0000
395@@ -230,7 +230,7 @@
396 output['index']['maas:v2:download']['products'])
397
398 def test_streams_product_index_empty_with_incomplete_resource(self):
399- resource = factory.make_boot_resource()
400+ resource = factory.make_BootResource()
401 factory.make_boot_resource_set(resource)
402 response = self.get_stream_client('index.json')
403 output = json.loads(response.content)
404@@ -272,7 +272,7 @@
405 output['products'])
406
407 def test_streams_product_download_empty_with_incomplete_resource(self):
408- resource = factory.make_boot_resource()
409+ resource = factory.make_BootResource()
410 factory.make_boot_resource_set(resource)
411 response = self.get_stream_client('maas:v2:download.json')
412 output = json.loads(response.content)
413@@ -332,7 +332,7 @@
414 self.assertEqual(newest_set.label, output_product['label'])
415
416 def test_streams_product_download_product_contains_multiple_versions(self):
417- resource = factory.make_boot_resource()
418+ resource = factory.make_BootResource()
419 resource_sets = [
420 factory.make_boot_resource_set(resource)
421 for _ in range(3)
422@@ -472,7 +472,7 @@
423 filename = filetype
424 size = randint(1024, 2048)
425 content = factory.make_string(size=size)
426- resource = factory.make_boot_resource(
427+ resource = factory.make_BootResource(
428 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
429 architecture=architecture)
430 resource_set = factory.make_boot_resource_set(
431@@ -586,7 +586,7 @@
432 rtype=None, name=None, architecture=None,
433 version=None, filename=None, filetype=None):
434 """Make boot resource that contains one set and one file."""
435- resource = factory.make_boot_resource(
436+ resource = factory.make_BootResource(
437 rtype=rtype, name=name, architecture=architecture)
438 resource_set = factory.make_boot_resource_set(resource, version=version)
439 rfile = factory.make_boot_resource_file_with_content(
440@@ -604,7 +604,7 @@
441 """
442 name = '%s/%s' % (product['os'], product['release'])
443 architecture = '%s/%s' % (product['arch'], product['subarch'])
444- resource = factory.make_boot_resource(
445+ resource = factory.make_BootResource(
446 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
447 architecture=architecture)
448 resource_set = factory.make_boot_resource_set(
449@@ -621,7 +621,7 @@
450
451 def make_boot_resources(self):
452 resources = [
453- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
454+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
455 for _ in range(3)
456 ]
457 resource_names = []
458@@ -649,7 +649,7 @@
459 def test_prevent_resource_deletion_doesnt_remove_unknown_resource(self):
460 resources, resource_names = self.make_boot_resources()
461 store = BootResourceStore()
462- resource = factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
463+ resource = factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
464 store.prevent_resource_deletion(resource)
465 self.assertItemsEqual(resource_names, store._resources_to_delete)
466
467@@ -673,7 +673,7 @@
468
469 def test_get_or_create_boot_resource_gets_resource(self):
470 name, architecture, product = make_product()
471- expected = factory.make_boot_resource(
472+ expected = factory.make_BootResource(
473 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
474 architecture=architecture)
475 store = BootResourceStore()
476@@ -684,7 +684,7 @@
477
478 def test_get_or_create_boot_resource_calls_prevent_resource_deletion(self):
479 name, architecture, product = make_product()
480- resource = factory.make_boot_resource(
481+ resource = factory.make_BootResource(
482 rtype=BOOT_RESOURCE_TYPE.SYNCED,
483 name=name, architecture=architecture)
484 store = BootResourceStore()
485@@ -695,7 +695,7 @@
486
487 def test_get_or_create_boot_resource_converts_generated_into_synced(self):
488 name, architecture, product = make_product()
489- resource = factory.make_boot_resource(
490+ resource = factory.make_BootResource(
491 rtype=BOOT_RESOURCE_TYPE.GENERATED,
492 name=name, architecture=architecture)
493 store = BootResourceStore()
494@@ -758,7 +758,7 @@
495 filename = factory.make_name('filename')
496 name = '%s/%s' % (os, series)
497 architecture = '%s/%s' % (arch, subarch)
498- resource = factory.make_boot_resource(
499+ resource = factory.make_BootResource(
500 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
501 architecture=architecture)
502 resource_set = factory.make_boot_resource_set(
503@@ -859,7 +859,7 @@
504 def test_insert_deletes_mismatch_largefile_keeps_other_resource_file(self):
505 name, architecture, product = make_product()
506 with transaction.atomic():
507- resource = factory.make_boot_resource(
508+ resource = factory.make_BootResource(
509 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
510 architecture=architecture)
511 resource_set = factory.make_boot_resource_set(
512@@ -889,7 +889,7 @@
513 def test_insert_creates_new_largefile(self):
514 name, architecture, product = make_product()
515 with transaction.atomic():
516- resource = factory.make_boot_resource(
517+ resource = factory.make_BootResource(
518 rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name,
519 architecture=architecture)
520 resource_set = factory.make_boot_resource_set(
521@@ -909,7 +909,7 @@
522 def test_resource_cleaner_removes_old_boot_resources(self):
523 with transaction.atomic():
524 resources = [
525- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
526+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
527 for _ in range(3)
528 ]
529 store = BootResourceStore()
530@@ -933,7 +933,7 @@
531
532 def test_resource_set_cleaner_keeps_only_newest_completed_set(self):
533 with transaction.atomic():
534- resource = factory.make_boot_resource(
535+ resource = factory.make_BootResource(
536 rtype=BOOT_RESOURCE_TYPE.SYNCED)
537 old_complete_sets = []
538 for _ in range(3):
539@@ -951,7 +951,7 @@
540
541 def test_resource_set_cleaner_removes_resources_with_empty_sets(self):
542 with transaction.atomic():
543- resource = factory.make_boot_resource(
544+ resource = factory.make_BootResource(
545 rtype=BOOT_RESOURCE_TYPE.SYNCED)
546 store = BootResourceStore()
547 store.resource_set_cleaner()
548@@ -1023,11 +1023,11 @@
549 MockCalledOnceWith())
550
551 def test_has_synced_resources_returns_true(self):
552- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
553+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.SYNCED)
554 self.assertTrue(bootresources.has_synced_resources())
555
556 def test_has_synced_resources_returns_false(self):
557- factory.make_boot_resource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
558+ factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
559 self.assertFalse(bootresources.has_synced_resources())
560
561 def test__import_resources_exists_early_without_force(self):