o/snapstate: add unit tests for doDownloadSnap with and without a sna…

…p icon url Signed-off-by: Oliver Calder <[email protected]>
canonical · Jan 31, 2025 · 11c11a1 · 11c11a1
1 parent e0a1210
commit 11c11a1
Show file tree

Hide file tree

Showing 3 changed files with 355 additions and 2 deletions.
diff --git a/overlord/snapstate/export_test.go b/overlord/snapstate/export_test.go
@@ -352,6 +352,10 @@ var (
 	DiscardSnapIcon      = discardSnapIcon
 )
 
+func MockStoreDownloadIcon(f func(ctx context.Context, name, targetPath, downloadURL string) error) (restore func()) {
+	return testutil.Mock(&storeDownloadIcon, f)
+}
+
 // link, misc handlers
 var (
 	MissingDisabledServices = missingDisabledServices

diff --git a/overlord/snapstate/handlers.go b/overlord/snapstate/handlers.go
@@ -717,6 +717,8 @@ func downloadSnapParams(st *state.State, t *state.Task) (*SnapSetup, StoreServic
 	return snapsup, sto, user, nil
 }
 
+var storeDownloadIcon = store.DownloadIcon
+
 func (m *SnapManager) doDownloadSnap(t *state.Task, tomb *tomb.Tomb) error {
 	st := t.State()
 	var rate int64
@@ -789,7 +791,7 @@ func (m *SnapManager) doDownloadSnap(t *state.Task, tomb *tomb.Tomb) error {
 				logger.Debugf("cannot download snap icon for %q: no icon URL", snapsup.SnapName())
 				return
 			}
-			if iconErr := store.DownloadIcon(ctx, snapsup.SnapName(), targetIconFn, iconURL); iconErr != nil {
+			if iconErr := storeDownloadIcon(ctx, snapsup.SnapName(), targetIconFn, iconURL); iconErr != nil {
 				logger.Debugf("cannot download snap icon for %q: %#v", snapsup.SnapName(), iconErr)
 			}
 		})
@@ -806,7 +808,7 @@ func (m *SnapManager) doDownloadSnap(t *state.Task, tomb *tomb.Tomb) error {
 				logger.Debugf("cannot download snap icon for %q: no icon URL", snapsup.SnapName())
 				return
 			}
-			if iconErr := store.DownloadIcon(ctx, snapsup.SnapName(), targetIconFn, iconURL); iconErr != nil {
+			if iconErr := storeDownloadIcon(ctx, snapsup.SnapName(), targetIconFn, iconURL); iconErr != nil {
 				logger.Debugf("cannot download snap icon for %q: %#v", snapsup.SnapName(), iconErr)
 			}
 		})