← Back to branch summary

~maas-committers/maas/trunk

« back to all changes in this revision

Viewing changes to src/provisioningserver/boot/tests/test_pxe.py

  • Committer: MAAS Lander
  • Author(s): Lee Trager
  • Date: 2016-11-07 21:52:22 UTC
  • mfrom: (5539.2.4 lp1639258)
  • Revision ID: maas_lander-20161107215222-gsh65bsta6fjd4wg
[r=blake-rouse][bug=1639258][author=ltrager] Send the boot kernel, initrd, and dtb filename when GetBootConfig is requested.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/boot/tests/test_pxe.py
269
269
        # Given the right configuration options, the PXE configuration is
270
270
        # correctly rendered.
271
271
        method = PXEBootMethod()
272
 
        params = make_kernel_parameters(self, purpose="install")
 
272
        params = make_kernel_parameters(self, purpose="xinstall")
273
273
        output = method.get_reader(backend=None, kernel_params=params)
274
274
        # The output is a BytesReader.
275
275
        self.assertThat(output, IsInstance(BytesReader))
284
284
        self.assertThat(
285
285
            output, MatchesAll(
286
286
                MatchesRegex(
287
 
                    r'.*^\s+KERNEL %s/di-kernel$' % re.escape(image_dir),
 
287
                    r'.*^\s+KERNEL %s/%s$' % (
 
288
                        re.escape(image_dir), params.kernel),
288
289
                    re.MULTILINE | re.DOTALL),
289
290
                MatchesRegex(
290
 
                    r'.*^\s+INITRD %s/di-initrd$' % re.escape(image_dir),
 
291
                    r'.*^\s+INITRD %s/%s$' % (
 
292
                        re.escape(image_dir), params.initrd),
291
293
                    re.MULTILINE | re.DOTALL),
292
294
                MatchesRegex(
293
295
                    r'.*^\s+APPEND .+?$',
300
302
        method = PXEBootMethod()
301
303
        params = make_kernel_parameters(
302
304
            testcase=self, osystem="ubuntu", arch="arm64",
303
 
            subarch="xgene-uboot-mustang", purpose="install")
 
305
            subarch="xgene-uboot-mustang", purpose="xinstall")
304
306
        output = method.get_reader(backend=None, kernel_params=params)
305
307
        # The output is a BytesReader.
306
308
        self.assertThat(output, IsInstance(BytesReader))
315
317
        self.assertThat(
316
318
            output, MatchesAll(
317
319
                MatchesRegex(
318
 
                    r'.*^\s+KERNEL %s/di-kernel$' % re.escape(image_dir),
319
 
                    re.MULTILINE | re.DOTALL),
320
 
                MatchesRegex(
321
 
                    r'.*^\s+INITRD %s/di-initrd$' % re.escape(image_dir),
322
 
                    re.MULTILINE | re.DOTALL),
323
 
                MatchesRegex(
324
 
                    r'.*^\s+FDT %s/di-dtb$' % re.escape(image_dir),
 
320
                    r'.*^\s+KERNEL %s/%s$' % (
 
321
                        re.escape(image_dir), params.kernel),
 
322
                    re.MULTILINE | re.DOTALL),
 
323
                MatchesRegex(
 
324
                    r'.*^\s+INITRD %s/%s$' % (
 
325
                        re.escape(image_dir), params.initrd),
 
326
                    re.MULTILINE | re.DOTALL),
 
327
                MatchesRegex(
 
328
                    r'.*^\s+FDT %s/%s$' % (
 
329
                        re.escape(image_dir), params.boot_dtb),
325
330
                    re.MULTILINE | re.DOTALL),
326
331
                MatchesRegex(
327
332
                    r'.*^\s+APPEND .+?$',
349
354
        self.assertThat(
350
355
            output, MatchesAll(
351
356
                MatchesRegex(
352
 
                    r'.*^\s+KERNEL %s/boot-kernel$' % re.escape(image_dir),
353
 
                    re.MULTILINE | re.DOTALL),
354
 
                MatchesRegex(
355
 
                    r'.*^\s+INITRD %s/boot-initrd$' % re.escape(image_dir),
356
 
                    re.MULTILINE | re.DOTALL),
357
 
                MatchesRegex(
358
 
                    r'.*^\s+FDT %s/boot-dtb$' % re.escape(image_dir),
 
357
                    r'.*^\s+KERNEL %s/%s$' % (
 
358
                        re.escape(image_dir), params.kernel),
 
359
                    re.MULTILINE | re.DOTALL),
 
360
                MatchesRegex(
 
361
                    r'.*^\s+INITRD %s/%s$' % (
 
362
                        re.escape(image_dir), params.initrd),
 
363
                    re.MULTILINE | re.DOTALL),
 
364
                MatchesRegex(
 
365
                    r'.*^\s+FDT %s/%s$' % (
 
366
                        re.escape(image_dir), params.boot_dtb),
359
367
                    re.MULTILINE | re.DOTALL),
360
368
                MatchesRegex(
361
369
                    r'.*^\s+APPEND .+?$',