token2/snapd
0
0
Fork 0
mirror of https://github.com/token2/snapd.git synced 2026-03-13 11:15:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

secboot, gadget: fix tests for ICE support

Browse Source 
Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
This commit is contained in:
Ondrej Kubik
2022-10-04 11:49:10 +00:00
committed by Michael Vogt
parent fe358e6953
commit 3c820959d0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gadget/install/encrypt_test.go
View File

@@ -99,7 +99,7 @@ func (s *encryptSuite) TestNewEncryptedDeviceLUKS(c *C) {
s.AddCleanup(s.mockCryptsetup.Restore)
calls := 0
restore := install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string) error {
restore := install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string, ice bool) error {
calls++
c.Assert(key, DeepEquals, s.mockedEncryptionKey)
c.Assert(label, Equals, "some-label-enc")
@@ -108,7 +108,7 @@ func (s *encryptSuite) TestNewEncryptedDeviceLUKS(c *C) {
})
defer restore()
dev, err := install.NewEncryptedDeviceLUKS(&mockDeviceStructure, s.mockedEncryptionKey, "some-label-enc", "some-label")
dev, err := install.NewEncryptedDeviceLUKS(&mockDeviceStructure, s.mockedEncryptionKey, false, "some-label-enc", "some-label")
c.Assert(calls, Equals, 1)
if tc.expectedErr == "" {
c.Assert(err, IsNil)

2
gadget/install/export_secboot_test.go
View File

@@ -34,7 +34,7 @@ var (
CreateEncryptedDeviceWithSetupHook = createEncryptedDeviceWithSetupHook
)
func MockSecbootFormatEncryptedDevice(f func(key keys.EncryptionKey, label, node string) error) (restore func()) {
func MockSecbootFormatEncryptedDevice(f func(key keys.EncryptionKey, label, node string, ice bool) error) (restore func()) {
r := testutil.Backup(&secbootFormatEncryptedDevice)
secbootFormatEncryptedDevice = f
return r

4
gadget/install/install_test.go
View File

@@ -308,7 +308,7 @@ func (s *installSuite) testInstall(c *C, opts installOpts) {
var saveEncryptionKey, dataEncryptionKey keys.EncryptionKey
secbootFormatEncryptedDeviceCall := 0
restore = install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string) error {
restore = install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string, ice bool) error {
if !opts.encryption {
c.Error("unexpected call to secboot.FormatEncryptedDevice when encryption is off")
return fmt.Errorf("no encryption functions should be called")
@@ -694,7 +694,7 @@ func (s *installSuite) testFactoryReset(c *C, opts factoryResetOpts) {
var dataPrimaryKey keys.EncryptionKey
secbootFormatEncryptedDeviceCall := 0
restore = install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string) error {
restore = install.MockSecbootFormatEncryptedDevice(func(key keys.EncryptionKey, label, node string, ice bool) error {
if !opts.encryption {
c.Error("unexpected call to secboot.FormatEncryptedDevice")
return fmt.Errorf("unexpected call")

2
secboot/encrypt_sb_test.go
View File

@@ -73,7 +73,7 @@ func (s *encryptSuite) TestFormatEncryptedDevice(c *C) {
})
defer restore()
err := secboot.FormatEncryptedDevice(myKey, "my label", "/dev/node")
err := secboot.FormatEncryptedDevice(myKey, "my label", "/dev/node", false)
c.Assert(calls, Equals, 1)
if tc.err == "" {
c.Assert(err, IsNil)