summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2023-12-11 04:16:27 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2023-12-11 04:16:27 -0600
commit0dd09ef74f85d27cfbae3cb78449598c2351efca (patch)
treeec3a8048879dde2bd65ff368f8f28b9b5135eecf
parent4b12fa25776b5f38e1e5e5a935efa2a2059d51d7 (diff)
downloadhorizon-0dd09ef74f85d27cfbae3cb78449598c2351efca.tar.gz
horizon-0dd09ef74f85d27cfbae3cb78449598c2351efca.tar.bz2
horizon-0dd09ef74f85d27cfbae3cb78449598c2351efca.tar.xz
horizon-0dd09ef74f85d27cfbae3cb78449598c2351efca.zip
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")
-rw-r--r--tests/fixtures/0257-bootloader-mips64.installfile (renamed from tests/fixtures/0257-bootloader-armv7.installfile)2
-rw-r--r--tests/spec/validator_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/fixtures/0257-bootloader-armv7.installfile b/tests/fixtures/0257-bootloader-mips64.installfile
index 2374ae5..657b9f4 100644
--- a/tests/fixtures/0257-bootloader-armv7.installfile
+++ b/tests/fixtures/0257-bootloader-mips64.installfile
@@ -3,5 +3,5 @@ hostname test.machine
pkginstall adelie-base
rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
mount /dev/sda1 /
-arch armv7
+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