Test suite: orig-include-exclude: Refactor: introduce test-push-[12]

No functional change (diffed two test logs to check).

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

diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 12478f3de555ece532d60e1a29a3b9694a2cffb1..027600611a7347f211b2c287f3ae491b3bf805b3 100755 (executable)
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -15,23 +15,35 @@ done
 
 cd $p
 
 
 cd $p
 

-v=1.0-2
-t-commit $v $v
-t-dgit --ch:-sa build
+test-push-1 () {
+       v=$1
+       ch=$2
+
+       t-commit $v $v
+       t-dgit $ch build
+}
+
+test-push-2 () {
+       t-dgit $ch push
+}
+
+test-push-1 1.0-2 --ch:-sa

 
 grep orig ../${p}_${v}_*.changes
 
 
 grep orig ../${p}_${v}_*.changes
 

-t-dgit --ch:-sa push
+test-push-2

 
 # check that dgit stripped out the orig update
 find $tmp/mirror -name '*orig*' -ls >../before
 
 # check that dgit stripped out the orig update
 find $tmp/mirror -name '*orig*' -ls >../before

+

 t-archive-process-incoming sid
 t-archive-process-incoming sid

+

 find $tmp/mirror -name '*orig*' -ls >../after
 diff -u ../before ../after
 
 find $tmp/mirror -name '*orig*' -ls >../after
 diff -u ../before ../after
 

-t-commit 'Some update' 1.1-1.2
-t-dgit --ch:-sd build
-t-dgit --ch:-sd push
+test-push-1 1.1-1.2 --ch:-sd
+
+test-push-2

 
 t-archive-process-incoming sid
 
 
 t-archive-process-incoming sid