X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fprotocol-compat;h=fcbeedb82d7cc02c4b786e32d4b407aa6b0c01a3;hb=5986d81a14f60f14ee2d31967be1bc2f6ba6cc7a;hp=b1b902549fa9238a6a5a53c8ef432600dceee080;hpb=5b9de0a5f1223706c6734636fdf9fb8392db510a;p=dgit.git

diff --git a/tests/tests/protocol-compat b/tests/tests/protocol-compat
index b1b90254..fcbeedb8 100755
--- a/tests/tests/protocol-compat
+++ b/tests/tests/protocol-compat
@@ -6,23 +6,27 @@ set -e
 t-setup-import examplegit
 t-tstunt-parsechangelog
 
+t-git-config dgit.default.distro foreign
+t-git-config dgit-distro.foreign.cmd-git false
+
 prep () {
 	dscf=$tmp/mirror/pool/main/example_$v.dsc
 }
 
 check () {
-	rm -rf $p.cloned
+	pd=$p.$suite
 	t-refs-same-start
 
 	t-archive-none $p
 	t-archive-query $suite
 
-	t-dgit clone $p $suite $p.cloned
-	cd $p.cloned
+	t-dgit clone $p $suite $pd
+	cd $pd
 	t-ref-head
 
 	$1
 
+	local distro=''
 	t-dgit import-dsc $dscf +imported
 	t-ref-same refs/heads/imported
 	cd ..
@@ -30,9 +34,9 @@ check () {
 
 reset () {
 	cd ..
-	rm -rf $p.cloned
-	mkdir $p.cloned
-	cd $p.cloned
+	rm -rf $pd
+	mkdir $pd
+	cd $pd
 	git init
 }
 
@@ -54,7 +58,7 @@ prep
 
 perl -i~ -pe 's/^(Dgit: \w+ \S+ \S+) (.*)/$1\n $2 EXTRA/' $dscf
 
-check
+check reset
 
 : ---------- older ----------
 
@@ -64,8 +68,16 @@ prep
 
 perl -i -pe 's/^(Dgit: \w+).*/$1/' $dscf
 
-t-git-config dgit.default.old-dsc-distro test-dummy
-
 check
 
+: ---------- expect fail ----------
+
+pd=$p.fail
+
+t-git-config dgit.default.old-dsc-distro downstream
+
+t-expect-fail 'no configured url and .dsc provides no hint' \
+t-dgit clone $p $suite $pd
+
+
 t-ok