test suite: t-{unapplied,dpm}-pushed-good: set $suite

t-pushed-good-core wants suite to be set.  Rather than having it
implicit, make it an argument.  Fix the two call sites where suite was
not trivially `sid'.

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

diff --git a/tests/lib b/tests/lib
index fa553af9d5e89af67a971ad23617ff1eedbc376e..616725dc815526da462049171f5dabe0964834ef 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -826,12 +826,14 @@ t-gbp-pushed-good () {
 }
 
 t-unapplied-pushed-good () {
+       local suite=${1:-sid}
        t-splitbrain-pushed-good-start
        t-splitbrain-pushed-good--unpack --skip-patches
        t-splitbrain-pushed-good-end-made-dep14
 }
 
 t-dpm-pushed-good () {
+       local suite=${1:-sid}
        t-splitbrain-pushed-good-start
        t-splitbrain-pushed-good--unpack
        t-splitbrain-rm-gitignore-patch

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 6886cf89652d6a222b0eb3b38aa36df58581af3d..3ab4572def4ae8ca544ce6e0de33a40d5c339b06 100755 (executable)
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -29,7 +29,7 @@ want-success () {
        t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
 
        t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
-       t-$qmode-pushed-good
+       t-$qmode-pushed-good $suite
 }