← Back to branch summary

~rsalveti/linaro-image-tools/generic-hwpack-oe

« back to all changes in this revision

Viewing changes to linaro_image_tools/hwpack/tests/test_config_v3.py

  • Committer: Milo Casagrande
  • Date: 2012-07-27 09:03:04 UTC
  • mfrom: (540.2.16 bootloader-selection)
  • Revision ID: milo@ubuntu.com-20120727090304-2sz2flkodyumrvul
Merged lp:~dooferlad/linaro-image-tools/bootloader-selection.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linaro_image_tools/hwpack/tests/test_config_v3.py
190
190
                                 "  package: ~~\n")
191
191
        self.assertValidationError(
192
192
            "Invalid value in u_boot_package in the metadata: ~~",
193
 
            config._validate_u_boot_package)
 
193
            config._validate_bootloader_package)
194
194
 
195
 
    def test_validate_invalid_u_boot_file(self):
 
195
    def test_validate_invalid_bootloader_file(self):
196
196
        config = self.get_config(self.valid_start_v3 +
197
197
                                 "bootloaders:\n"
198
198
                                 " u_boot:\n"
199
199
                                 "  file: ~~\n")
200
200
        self.assertValidationError("Invalid path: ~~",
201
 
                                   config._validate_u_boot_file)
 
201
                                   config._validate_bootloader_file)
202
202
 
203
203
    def test_validate_invalid_kernel_file(self):
204
204
        config = self.get_config(self.valid_start_v3 +
272
272
    def test_validate_wireless_interfaces(self):
273
273
        self.assertTrue("XXX What is an invalid interface name?")
274
274
 
275
 
    def test_validate_u_boot_in_boot_part_bool(self):
 
275
    def test_validate_bootloader_in_boot_part_bool(self):
276
276
        config = self.get_config(
277
277
            self.valid_start_v3 +
278
278
            "bootloaders:\n"
279
279
            "   u_boot:\n"
280
280
            "    in_boot_part: Nope\n")
281
281
        self.assertValidationError(
282
 
            "Invalid value for u_boot_in_boot_part: Nope",
 
282
            "Invalid value for bootloader_in_boot_part: Nope",
283
283
            config._validate_bootloader_file_in_boot_part)
284
284
 
285
285
    def test_find_board_specific_variable(self):
444
444
        self.assertEqual("bootfs_rootfs",
445
445
                         config.partition_layout)
446
446
 
447
 
    def test_u_boot_file(self):
 
447
    def test_bootloader_file(self):
448
448
        config = self.get_config(self.valid_complete_v3 + self.valid_end)
449
449
        config.validate()
450
450
        self.assertEqual("usr/lib/u-boot/smdkv310/u-boot.bin",
451
 
                         config.u_boot_file)
 
451
                         config.bootloader_file)
452
452
 
453
453
    def test_u_boot_package(self):
454
454
        config = self.get_config(self.valid_complete_v3 + self.valid_end)
455
455
        config.validate()
456
456
        self.assertEqual("u-boot-linaro-s5pv310",
457
 
                         config.u_boot_package)
 
457
                         config.bootloader_package)
458
458
 
459
459
    def test_spl_file(self):
460
460
        config = self.get_config(self.valid_complete_v3 + self.valid_end)