diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-07-14 08:01:48 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2016-07-14 08:01:48 +0200 |
| commit | 1177d574b64d752ee1c8b007f9e54beb82a55f50 (patch) | |
| tree | 401c1d9c40a86ff73789fccd996795584155cba3 | |
| parent | 7acb1ad141993bcb536f9cdbe48c1a20997076aa (diff) | |
update tests for the latest codefeature/rollback2
| -rw-r--r-- | overlord/snapstate/snapmgr_test.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/overlord/snapstate/snapmgr_test.go b/overlord/snapstate/snapmgr_test.go index 9d32a42554..5e1d11402e 100644 --- a/overlord/snapstate/snapmgr_test.go +++ b/overlord/snapstate/snapmgr_test.go @@ -178,10 +178,10 @@ func (s *snapmgrTestSuite) TestUpdateCreatesGCTasks(c *C) { snapstate.Set(s.state, "some-snap", &snapstate.SnapState{ Active: true, Sequence: []*snap.SideInfo{ - {RealName: "some-snap", Revision: snap.R(1)}, - {RealName: "some-snap", Revision: snap.R(2)}, - {RealName: "some-snap", Revision: snap.R(3)}, - {RealName: "some-snap", Revision: snap.R(4)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(1)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(2)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(3)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(4)}, }, Current: snap.R(4), }) @@ -208,10 +208,10 @@ func (s *snapmgrTestSuite) TestUpdateCreatesDiscardAfterCurrentTasks(c *C) { snapstate.Set(s.state, "some-snap", &snapstate.SnapState{ Active: true, Sequence: []*snap.SideInfo{ - {RealName: "some-snap", Revision: snap.R(1)}, - {RealName: "some-snap", Revision: snap.R(2)}, - {RealName: "some-snap", Revision: snap.R(3)}, - {RealName: "some-snap", Revision: snap.R(4)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(1)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(2)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(3)}, + {RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(4)}, }, Current: snap.R(1), }) @@ -2723,10 +2723,10 @@ func (s *snapmgrTestSuite) TestUpdateTasksWithOldCurrent(c *C) { s.state.Lock() defer s.state.Unlock() - si1 := &snap.SideInfo{RealName: "some-snap", Revision: snap.R(1)} - si2 := &snap.SideInfo{RealName: "some-snap", Revision: snap.R(2)} - si3 := &snap.SideInfo{RealName: "some-snap", Revision: snap.R(3)} - si4 := &snap.SideInfo{RealName: "some-snap", Revision: snap.R(4)} + si1 := &snap.SideInfo{RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(1)} + si2 := &snap.SideInfo{RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(2)} + si3 := &snap.SideInfo{RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(3)} + si4 := &snap.SideInfo{RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(4)} snapstate.Set(s.state, "some-snap", &snapstate.SnapState{ Active: true, Channel: "edge", |