test-push-1 () {
v=$1
ch=$2
+ suite=$3
- t-commit $v $v
+ t-commit $v $v $suite
t-dgit $ch build
}
test-push-2 () {
$test_push_2_hook
- t-dgit $ch push
+ t-dgit $ch "$@" push
}
test-push-1 1.0-2 --ch:-sa
test-push-2
+origs_findls () {
+ find $tmp/mirror -name '*orig*' -ls \
+ | perl -pe 's/^(\s*\d+\s+\d+\s+\S+\s)\s*\d+(\s)/$1$2/'
+}
+
# check that dgit stripped out the orig update
-find $tmp/mirror -name '*orig*' -ls >../before
+origs_findls >../before
t-archive-process-incoming sid
-find $tmp/mirror -name '*orig*' -ls >../after
+origs_findls >../after
diff -u ../before ../after
test-push-1 1.1-1.2 --ch:-sd
t-dgit clone $p
# ^ checks that all the origs are there, ie that dgit added the origs
+cd ..