chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-badcommit-fixup; In --check mode, exit status 2 if things are not fine
[dgit.git]
/
tests
/
tests
/
import-dsc
diff --git
a/tests/tests/import-dsc
b/tests/tests/import-dsc
index 1a9c7018ba580b4891793003c2d7a2215aeedae0..b86eef63c913373b1989e815fc0784b63bb4e801 100755
(executable)
--- a/
tests/tests/import-dsc
+++ b/
tests/tests/import-dsc
@@
-69,7
+69,7
@@
cd $p.2
git init
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
t-expect-fail "Your git tree does not have that object" \
check-import ../mirror/pool/main 1.2
@@
-77,7
+77,7
@@
check-import ../mirror/pool/main 1.2
check-import ../mirror/pool/main 1.2 --force-import-dsc-with-dgit-field
v=1.0-1.100
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
t-expect-fail E:'Branch.*already exists' \
t-dgit import-dsc $dsc2 $branch
@@
-93,4
+93,7
@@
t-dgit import-dsc $dsc2 +$branch
mb=$(t-git-merge-base merge-reset $branch)
test "x$mb" = x
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