daemon, tests/main/component-sideload: support sideloading multiple s…

…naps and components at the same time (#14846)

* daemon, tests/main/component-sideload: support sideloading multiple snaps and components at the same time

* daemon: add doc comment for uploadedOrInstalledSnapInfoMatcher

* daemon: fix typo

daemon/api_model.go

@@ -192,12 +192,12 @@ func startOfflineRemodelChange(st *state.State, newModel *asserts.Model,
 	for _, psi := range slInfo.snaps {
 		// Move file to the same name of what a downloaded one would have
 		dest := filepath.Join(dirs.SnapBlobDir,
-			fmt.Sprintf("%s_%s.snap", psi.sideInfo.RealName, psi.sideInfo.Revision))
+			fmt.Sprintf("%s_%s.snap", psi.info.RealName, psi.info.Revision))
 		os.Rename(psi.tmpPath, dest)
 		// Avoid trying to remove a file that does not exist anymore
 		*pathsToNotRemove = append(*pathsToNotRemove, psi.tmpPath)
 
-		sideInfos = append(sideInfos, psi.sideInfo)
+		sideInfos = append(sideInfos, &psi.info.SideInfo)
 		paths = append(paths, dest)
 	}
 

daemon/api_model_test.go

@@ -614,8 +614,12 @@ func (s *modelSuite) testPostOfflineRemodel(c *check.C, params *testPostOfflineR
 		return chg, nil
 	})()
 
-	sis := []*snap.SideInfo{{RealName: snapName, Revision: snap.Revision{N: snapRev}}}
-	defer daemon.MockSideloadSnapsInfo(sis)()
+	infos := []*snap.Info{{SideInfo: snap.SideInfo{
+		RealName: snapName,
+		Revision: snap.R(snapRev),
+	}}}
+
+	defer daemon.MockSideloadSnapsInfo(infos)()
 
 	// create a valid model assertion
 	c.Assert(err, check.IsNil)