From 0dd09ef74f85d27cfbae3cb78449598c2351efca Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 11 Dec 2023 04:16:27 -0600 Subject: tests: Fix bootloader test Now that ARMv7 supports EFI, we need to use MIPS for the 'no default' case. Fixes: 39dd5776f7 ("hscript: bootloader: Support EFI boot on ARMv7") --- tests/fixtures/0257-bootloader-armv7.installfile | 7 ------- tests/fixtures/0257-bootloader-mips64.installfile | 7 +++++++ tests/spec/validator_spec.rb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 tests/fixtures/0257-bootloader-armv7.installfile create mode 100644 tests/fixtures/0257-bootloader-mips64.installfile diff --git a/tests/fixtures/0257-bootloader-armv7.installfile b/tests/fixtures/0257-bootloader-armv7.installfile deleted file mode 100644 index 2374ae5..0000000 --- a/tests/fixtures/0257-bootloader-armv7.installfile +++ /dev/null @@ -1,7 +0,0 @@ -network false -hostname test.machine -pkginstall adelie-base -rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/ -mount /dev/sda1 / -arch armv7 -bootloader /dev/sda diff --git a/tests/fixtures/0257-bootloader-mips64.installfile b/tests/fixtures/0257-bootloader-mips64.installfile new file mode 100644 index 0000000..657b9f4 --- /dev/null +++ b/tests/fixtures/0257-bootloader-mips64.installfile @@ -0,0 +1,7 @@ +network false +hostname test.machine +pkginstall adelie-base +rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/ +mount /dev/sda1 / +arch mips64 +bootloader /dev/sda diff --git a/tests/spec/validator_spec.rb b/tests/spec/validator_spec.rb index 8f33330..d45b6e8 100644 --- a/tests/spec/validator_spec.rb +++ b/tests/spec/validator_spec.rb @@ -1237,7 +1237,7 @@ RSpec.describe 'HorizonScript validation', :type => :aruba do expect(last_command_started).to have_output(/error: .*bootloader.*/) end it "fails when loader not specified and architecture doesn't have default" do - use_fixture '0257-bootloader-armv7.installfile' + use_fixture '0257-bootloader-mips64.installfile' run_validate expect(last_command_started).to have_output(/error: .*bootloader: no default.*/) end -- cgit v1.2.3-60-g2f50