[autopkgtest] Refactor the snapd-seed-glue calls for deduplication.

debian/changelog

@@ -1,3 +1,11 @@
+snapd-extra-utils (1.0.4) UNRELEASED; urgency=medium
+
+  * [autopkgtest] Use snaps that are available on all arches, to fix armhf,
+    ppc64el, and s390x failures.
+  * [autopkgtest] Refactor the snapd-seed-glue calls for deduplication.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 24 Nov 2024 20:55:54 -0600
+
 snapd-extra-utils (1.0.3) plucky; urgency=medium
 
   * In snapd-seed-glue, remove redundant decoding/encoding for account key.

debian/tests/snapd-seed-glue

@@ -14,22 +14,25 @@ confirm_success () {
     fi
 }
 
-echo "Testing snapd-seed-glue with firefox..."
+# Function to run snapd-seed-glue with given arguments
+run_snapd_seed_glue () {
+    /usr/bin/snapd-seed-glue --verbose --seed firefox_test "$@" > >(tee -a "$OUTPUT_FILE") 2>&1
+    confirm_success
+}
 
-/usr/bin/snapd-seed-glue --verbose --seed firefox_test firefox > >(tee -a "$OUTPUT_FILE") 2>&1
-confirm_success
+echo "[snapd-seed-glue autopkgtest] Testing snapd-seed-glue with hello..."
 
-echo "Add krita to the same seed..."
+run_snapd_seed_glue hello
 
-/usr/bin/snapd-seed-glue --verbose --seed firefox_test firefox krita > >(tee -a "$OUTPUT_FILE") 2>&1
-confirm_success
+echo "[snapd-seed-glue autopkgtest] Add htop to the same seed..."
 
-echo "Remove krita and replace it with Thunderbird..."
+run_snapd_seed_glue hello htop
 
-/usr/bin/snapd-seed-glue --verbose --seed firefox_test firefox thunderbird > >(tee -a "$OUTPUT_FILE") 2>&1
-confirm_success
+echo "[snapd-seed-glue autopkgtest] Remove htop and replace it with btop..."
 
-echo "Confirm that non-existent snaps will fail..."
+run_snapd_seed_glue hello btop
+
+echo "[snapd-seed-glue autopkgtest] Confirm that non-existent snaps will fail..."
 
 /usr/bin/snapd-seed-glue --verbose --seed test_dir absolutelyridiculouslongnamethatwilldefinitelyneverexist > >(tee -a "$OUTPUT_FILE") 2>&1 || echo "Fail expected"
 if ! grep -q "cannot install snap \"absolutelyridiculouslongnamethatwilldefinitelyneverexist\": snap not found" "$OUTPUT_FILE"; then