From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 03:26:28 +0000 (+0000)
Subject: test suite: downstream-gitless: Test import-dsc
X-Git-Tag: archive/debian/3.0~56
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b77d2fd90d945d937ed3983d139d207ab4e1913e

test suite: downstream-gitless: Test import-dsc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/downstream-gitless b/tests/tests/downstream-gitless
index 4b72470a..b7f1c608 100755
--- a/tests/tests/downstream-gitless
+++ b/tests/tests/downstream-gitless
@@ -35,7 +35,9 @@ filter () {
 cd $p
 filter				\
   refs/heads/master		\
-  refs/remotes/dgit/dgit/sid	\
+  refs/remotes/dgit/dgit/sid
+
+t-ref-head
 
 cd ../git/$p.git
 filter				\
@@ -51,21 +53,41 @@ cd ..
 suitespecs=avon
 t-reprepro-cfg ds- downstream
 t-reprepro-setup ds-
+distro=''
 
-t-reprepro-includedsc avon $tmp/mirror/pool/main/example_1.1.dsc ds-
 
+dscf=$tmp/mirror/pool/main/example_1.1.dsc
+t-reprepro-includedsc avon $dscf ds-
 t-reprepro-regen ds-
 
-distro=''
+
+mkdir $p.import
+cd $p.import
+git init
+t-dgit import-dsc $dscf x
+cd ..
 
 t-git-config dgit-suite.avon.distro downstream
 t-git-config dgit-distro.downstream.git-check false
 
 t-dgit clone example avon example.avon
 
-t-reprepro-includedsc avon $tmp/mirror/pool/main/example_2.1.dsc ds-
+
+dscf=$tmp/mirror/pool/main/example_2.1.dsc
+t-reprepro-includedsc avon $dscf ds-
+t-reprepro-regen ds-
+
 
 cd $p.avon
 t-dgit fetch
+t-ref-same refs/remotes/dgit/dgit/avon
+
+cd ../$p.import
+git init
+t-dgit import-dsc $dscf +x
+t-ref-same refs/heads/x
+git show x | grep Spong
+cd ..
+
 
 #t-ok