Skip to content

Commit 9879b79

Browse files
seed,overlord: add new component to snap for unit testing
1 parent cba66bf commit 9879b79

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

overlord/devicestate/devicestate_install_api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ func (s *deviceMgrInstallAPISuite) testInstallFinishStep(c *C, opts finishStepOp
353353

354354
var kModsRevs map[string]snap.Revision
355355
if opts.hasKernelModsComps {
356-
kModsRevs = map[string]snap.Revision{"kcomp1": snap.R(77), "kcomp2": snap.R(77)}
356+
kModsRevs = map[string]snap.Revision{"kcomp1": snap.R(77), "kcomp2": snap.R(77), "kcomp3": snap.R(77)}
357357
}
358358
seedOpts := mockSystemSeedWithLabelOpts{
359359
isClassic: opts.installClassic,

overlord/devicestate/devicestate_install_mode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ func (s *deviceMgrInstallModeSuite) TestInstallExpTasksWithKMods(c *C) {
886886
isClassic: false,
887887
hasSystemSeed: true,
888888
hasPartial: false,
889-
kModsRevs: map[string]snap.Revision{"kcomp1": snap.R(7), "kcomp2": snap.R(14)},
889+
kModsRevs: map[string]snap.Revision{"kcomp1": snap.R(7), "kcomp2": snap.R(14), "kcomp3": snap.R(21)},
890890
types: []snap.Type{snap.TypeKernel},
891891
}
892892
s.mockSystemSeedWithLabel(c, "1234", seedCopyFn, seedOpts)
@@ -966,7 +966,7 @@ func (s *deviceMgrInstallModeSuite) TestInstallExpTasksWithKModsTestMode(c *C) {
966966
hasSystemSeed: true,
967967
hasPartial: false,
968968
testCompsMode: true,
969-
kModsRevs: map[string]snap.Revision{"kcomp1": snap.R(7), "kcomp2": snap.R(14)},
969+
kModsRevs: map[string]snap.Revision{"kcomp1": snap.R(7), "kcomp2": snap.R(14), "kcomp3": snap.R(21)},
970970
types: []snap.Type{snap.TypeKernel},
971971
}
972972
s.mockSystemSeedWithLabel(c, "1234", seedCopyFn, seedOpts)

seed/seedtest/sample.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ components:
212212
type: kernel-modules
213213
kcomp2:
214214
type: kernel-modules
215+
kcomp3:
216+
type: kernel-modules
215217
`,
216218
"pc-kernel+kcomp1": `component: pc-kernel+kcomp1
217219
type: kernel-modules
@@ -220,6 +222,10 @@ version: 1.0
220222
"pc-kernel+kcomp2": `component: pc-kernel+kcomp2
221223
type: kernel-modules
222224
version: 1.0
225+
`,
226+
"pc-kernel+kcomp3": `component: pc-kernel+kcomp3
227+
type: kernel-modules
228+
version: 1.0
223229
`,
224230
"pc=22": `name: pc
225231
type: gadget

0 commit comments

Comments
 (0)