X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Forig-include-exclude;h=5617a1e7162d3c740f5edad96aef6916652ba098;hp=027600611a7347f211b2c287f3ae491b3bf805b3;hb=f046c1a2174b3ee12b57ce7baf777f6fd518608b;hpb=326b9679f1ae22dde2016366c699ab6832987855

diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 02760061..5617a1e7 100755
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -2,56 +2,20 @@
 set -e
 . tests/lib
 
-t-tstunt-parsechangelog
+suitespecs+=' stable'
 
-t-archive example 1.0-1
-t-git-none
+. $troot/lib-orig-include-exclude
 
-t-dgit clone $p
-
-for o in orig orig-docs; do
-	cp ${p}_{1.0,1.1}.${o}.tar.gz
-done
+ofb=example_1.1.orig.tar
+zcat $ofb.gz >$ofb.SPONG
+gzip -1Nv $ofb.SPONG
+mv $ofb.SPONG.gz $ofb.gz
 
 cd $p
 
-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
-
-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
-
-test-push-1 1.1-1.2 --ch:-sd
-
-test-push-2
-
-t-archive-process-incoming sid
-
-cd ..
-mkdir get
-cd get
+test-push-1 1.1-1.3 '' stable
 
-t-dgit clone $p
-# ^ checks that all the origs are there, ie that dgit added the origs
+t-expect-fail E:'archive contains .* with different checksum' \
+test-push-2 --new
 
 echo done.