Test suite: t-archive-none: Support multiple suites

t-archive-none now honours `suitespecs', which defaults to just
`sid:unstable'.

No overall functional change since no-one sets suitespecs to a
non-default value.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 27 insertions, 13 deletions

diff --git a/tests/lib b/tests/lib
index bd83be7..5f41369 100644
--- a/tests/lib
+++ b/tests/lib
@@ -63,6 +63,7 @@ run_dinstall		= 0
 END
 
 : ${tagpfx:=test-dummy}
+: ${suitespecs:=sid:unstable}
 
 t-git-next-date () {
 	GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
@@ -208,30 +209,43 @@ t-prep-newpackage () {
 
 t-archive-none () {
 	t-select-package $1
-	mkdir -p $tmp/aq $tmp/mirror/pool/main
+	mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main
 
-	local suite=sid
+	: >$tmp/aq/suites
+	local jsondelim="["
 
-	>$tmp/aq/package.$suite.$p
-	t-archive-updated $suite $p
+	local suitespec
+	for suitespec in $suitespecs; do
+		local suite=${suitespec%%:*}
+		local sname=${suitespec#*:}
+
+		>$tmp/aq/package.$suite.$p
+		t-archive-updated $suite $p
 
-	>$tmp/aq/package.new.$p
-	t-archive-updated new $p
+		>$tmp/aq/package.new.$p
+		t-archive-updated new $p
 
-	ln -s sid $tmp/aq/dsc_in_suite/unstable
-	cat <<'END' >$tmp/aq/suites
-[
+		ln -s $suite $tmp/aq/dsc_in_suite/$sname
+
+		cat <<END >>$tmp/aq/suites
+$jsondelim
    {
       "archive" : "ftp-master",
-      "codename" : "sid",
+      "codename" : "$suite",
       "components" : [
          "main",
          "contrib",
          "non-free"
       ],
-      "name" : "unstable",
-      "dakname" : "unstable"
-   }
+      "name" : "$sname",
+      "dakname" : "$sname"
+END
+
+		jsondelim="   },"
+
+	done
+	cat <<END >>$tmp/aq/suites
+    }
 ]
 END
 }