X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Forig-include-exclude;h=a37f9974b230ec85fea266b7f952d73be65888b5;hb=bcca6a6dfc34e624274055ed1dd3fc3371a539a4;hp=12478f3de555ece532d60e1a29a3b9694a2cffb1;hpb=69d9da0c29fbc942a406d2dfad4f8616d67888bf;p=dgit.git

diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 12478f3d..a37f9974 100755
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -2,44 +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
 
-v=1.0-2
-t-commit $v $v
-t-dgit --ch:-sa build
-
-grep orig ../${p}_${v}_*.changes
-
-t-dgit --ch:-sa push
-
-# 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
-
-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.
+t-ok