fixup! o/devicestate: consider snapd snap when remodeling

overlord/managers_test.go

@@ -8433,27 +8433,26 @@ func (s *mgrsSuiteCore) TestRemodelUC20SnapWithPrereqsMissingDeps(c *C) {
 		"revision": "1",
 	})
 
+	st := s.o.State()
+	st.Lock()
+	defer st.Unlock()
+
 	s.prereqSnapAssertions(c, map[string]interface{}{
 		"snap-name": "prereq",
 	})
 
 	snapPath, _ := s.makeStoreTestSnap(c, prereqSnapYaml, "1")
 	s.serveSnap(snapPath, "1")
-	snapdPath, _ := s.makeStoreTestSnap(c, "name: snapd\ntype: snapd\nversion: 123", "1")
-	s.serveSnap(snapdPath, "2")
-
-	st := s.o.State()
-	st.Lock()
-	defer st.Unlock()
 
 	snapstate.Set(st, "core", nil)
 	snapstate.Set(st, "snapd", &snapstate.SnapState{
 		Active: true,
 		Sequence: []*snap.SideInfo{
 			{RealName: "snapd", SnapID: fakeSnapID("snapd"), Revision: snap.R(1)},
 		},
-		Current:  snap.R(1),
-		SnapType: "snapd",
+		Current:         snap.R(1),
+		SnapType:        "snapd",
+		TrackingChannel: "latest/stable",
 		Flags: snapstate.Flags{
 			Required: true,
 		},