X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=216ec815daf68fd8ae128955a6a3efff8458a8f0;hp=c403dc72b0e29acf5f60f6584a283789c71de8cb;hb=90905e9db641a5843f50c8aa02891ca198d1853a;hpb=915017a37d1da31b3835bc181f464cd4af09b513

diff --git a/tests/lib b/tests/lib
index c403dc72..216ec815 100644
--- a/tests/lib
+++ b/tests/lib
@@ -542,9 +542,14 @@ t-check-pushed-master () {
 t-pushed-good () {
 	local branch=$1
 	local suite=${2:-sid}
+	t-refs-same \
+		refs/heads/$branch
+	t-pushed-good-core
+}
+	
+t-pushed-good-core () {
 	t-ref-dsc-dgit
 	t-refs-same \
-		refs/heads/$branch \
 		`t-v-tag` \
 		refs/remotes/dgit/dgit/$suite
 	t-refs-notexist \
@@ -613,11 +618,16 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
-t-ref-dsc-dgit () {
+t-incoming-dsc () {
 	local dsc=${p}_${v}.dsc
-	local val=`t-822-field $tmp/incoming/$dsc Dgit`
-	perl -e '$_=shift @ARGV; die "$dsc Dgit $_ ?" unless m/^\w+\b/;' "$val"
-	t-ref-same-val $dsc "$val"
+	incoming_dsc=$tmp/incoming/$dsc
+}
+
+t-ref-dsc-dgit () {
+	t-incoming-dsc
+	local val=`t-822-field $incoming_dsc Dgit`
+	perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+	t-ref-same-val $incoming_dsc "$val"
 }
 
 t-apply-diff () {