summaryrefslogtreecommitdiff
path: root/tests/tests/orig-include-exclude
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-23 01:00:42 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 16:36:20 +0000
commit326b9679f1ae22dde2016366c699ab6832987855 (patch)
tree4b36ff0204119e3f5f95ea7755d2eda65802a1da /tests/tests/orig-include-exclude
parent69d9da0c29fbc942a406d2dfad4f8616d67888bf (diff)
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>
Diffstat (limited to 'tests/tests/orig-include-exclude')
-rwxr-xr-xtests/tests/orig-include-exclude26
1 files changed, 19 insertions, 7 deletions
diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 12478f3..0276006 100755
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -15,23 +15,35 @@ done
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
-t-dgit --ch:-sa push
+test-push-2
# check that dgit stripped out the orig update
find $tmp/mirror -name '*orig*' -ls >../before
+
t-archive-process-incoming sid
+
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