dgit: Regularise patch filenames, and defend against funny commit subjects

[dgit.git] / tests / tests / import-dsc

diff --git a/tests/tests/import-dsc b/tests/tests/import-dsc
index 1a9c7018ba580b4891793003c2d7a2215aeedae0..073ba7be50409b7f63453d0ae92f59ea14e8d153 100755 (executable)
--- a/tests/tests/import-dsc
+++ b/tests/tests/import-dsc
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 . tests/lib
+t-tstunt-parsechangelog
 
 t-setup-import examplegit
 
@@ -69,15 +70,15 @@ cd $p.2
 
 git init
 
-check-import ../../../pkg-srcs 1.0-1
+check-import $troot/pkg-srcs 1.0-1
 
 t-expect-fail "Your git tree does not have that object" \
-check-import ../mirror/pool/main 1.2
+check-import ../mirror/pool/main 1.2 --no-chase-dsc-distro
 
 check-import ../mirror/pool/main 1.2 --force-import-dsc-with-dgit-field
 
 v=1.0-1.100
-dsc2=../../../pkg-srcs/${p}_${v}.dsc
+dsc2=$troot/pkg-srcs/${p}_${v}.dsc
 
 t-expect-fail E:'Branch.*already exists' \
 t-dgit import-dsc $dsc2 $branch
@@ -93,4 +94,7 @@ t-dgit import-dsc $dsc2 +$branch
 mb=$(t-git-merge-base merge-reset $branch)
 test "x$mb" = x
 
-echo ok.
+t-expect-fail 'signature check failed' \
+t-dgit import-dsc --require-valid-signature $dsc2 +$branch
+
+t-ok