From e4571775f5040997a10d8bf66f11df67d96d42d0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 24 Oct 2016 02:04:52 +0100
Subject: [PATCH] Test suite: Provide absurd-gitapply test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/tests/control                          |   2 +-
 .../example_1.0-1+absurd.debian.tar.xz        | Bin 0 -> 1416 bytes
 tests/pkg-srcs/example_1.0-1+absurd.dsc       |  22 ++++++++++++++++++
 tests/tests/absurd-gitapply                   |  16 +++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz
 create mode 100644 tests/pkg-srcs/example_1.0-1+absurd.dsc
 create mode 100755 tests/tests/absurd-gitapply

diff --git a/debian/tests/control b/debian/tests/control
index 6ef62714..b4c278db 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -21,7 +21,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8)
 Restrictions: x-dgit-git-only
 
-Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gitconfig import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges newtag-clone-nogit oldnewtagalt oldtag-clone-nogit overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
+Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gitconfig import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges newtag-clone-nogit oldnewtagalt oldtag-clone-nogit overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8)
 
diff --git a/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz b/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..9a2dd124d3f8a629d09fe9a350d5c0f751336c11
GIT binary patch
literal 1416
zcmV;31$X-WH+ooF000E$*0e?f03iVu0001VFXf})PyYo*T>vr}NNor1@tIyK_)om{
z6G3Rf3tP$4y<UnzVG86Z_OUpw_ci=Ke&4N%KF2N7qCm<w2Hkyk)`~Q<O*(N-ISpkH
za^V>vq!SBdYneqv`@HJY-athwd{US<h#5dP7PS<zd?V=iU8Q6?4J{5zkVyRUYY^U;
z+6;aLVwi5vjWK?T{w=W#vA$TVAJ_n%;F}<KlsWTF*9Qt?yTmUrJ^2ed5^KTF#i3$n
z=>uRfISJ;qd1E1&{p=br4z~*q7@1Vw8uT-jOV*ZBSS&(1ZN9MzCHKP$#D6WP@3N(H
z?W=`ew$x<ij<ru3NqgZeAy}YfdC2nV(e*QK8anM~yvOK$c7ycsl6no~&GXD|20<%!
z;*baaZfi*twIVk?OFqcy0FIMMQ#e{u5|l_VZi4)p1ufFI=LDj5G;_GK<^8dxKjvG3
zr?=g8TfgPt;TX?}=Ztd0baUPWHmGCe*MX3Sj9LX_wePb;R7lfut(#))D=GOVwkcI@
zA}xL8MPyUNxA0Xe%qGWjjS;80^sN2UPrFsvjGXD`TYM%TXi%rHi)6nNw3%GVe%4Vi
zssKhggWO;5qbBff2Bqd3Ur9{@Kb2ttsv$7$#8C9OyZjL0q!GuO=(#wi>z6Dbnf0wN
zZ+ixo*pPKoltVv9XVPzn>0(Q!tXFV!TIpB;Gt!?G({77Cg(zq?e*xpsYIxk(_5&`#
zB@B4xB;!XCi}GO)W3%^zwF|d{Kve@U!3s`TEgB_};+64yLo4T!10~|*6?2oLDL@VG
zpxUJ-I9QWrW&jMZd5QBdhtE+R=6CgllTy@aZDkh7UYma!nONd6uD`W<dKp}z0BPvV
zYC&qWpL|~vm7RoT(_`1dgh-@j<3fX(P=WTn;@>nJA~W7EuL8r%Nvw1&=YX2e0aS&d
zuNN!DM-!S9vDBUE+@>5Wi^Nw8DEwn1{*8lgv)>IUv5B<UtsYwtaQZe+Qt{h)&?dpr
z)1|N<61)e*B(@A)J{e(&hb#}_owo~h`3qBnWZz+;##WH(8={R4!be#8sjz$qF14iz
zvzknarLP6d4kUuak>x2t189E!DylW`*WI`T5r7X_(QH~H%H<R=MPG*pq)fB{l;IY<
zKT3H}ZKe#azTXInn4n5929-<OYXz<fjsLRHVxb%#3j7)W{FiWdpG)+*BbEkkG?{&S
z;J~BfyIxTHDSb)7E3FvNX5|-^5eBF2^QK@N55aDO*Z(X7sCdd`&3(f&?8l4CM3Yi6
zAFbB*_)ld|4~6&#m}PB!E&`7~TlSGY6#f{LtqKngqwm^czf;0qmS*jc(KatsM`STW
zZLlx~;jn}xDLP=pprl`CJ0gkt09Q&ptyU<6-)XvSS6sLzZDR9&Xw3M<mj|0Ak$-Zz
zMy}LTF;rekFa=VB=frC#Yf}b7i2zzD2lIk<8J#uW^`F8d9WN=>GwBWcWEG3t?YNqG
zt~3)-H?U{S=h8~RK8Oo7A`}^ZB#{bM1bavs$Eat+BB#|cVZm$%JAtZq+2$)_+@X7@
zK>SW?VF@xzVJ1f$=M&W*4V*yuv)JXVDmRN#zY)QAZ{cdVfE_781Eb1!ynH9UlFCjd
zV07Nyy6%i&HzrRU#mGw}#Qo2^>)44Kl)HAPYOY){Q9*YFiuQ2t=B6?SulGZ1@an5!
z4!Ujv%#=@RRg?&WFV!%9^$La5!Uo?L$FIe0YT~^21^-eF>biuJp@7|uaxhg(;L2zK
zzQy!2?*E#b6}}1%MYkhwm&6Z{iNGM<Wv27Z_fi>opjo*90001NuKl&<dp8UK0pbdP
WpaB5ytW*E7#Ao{g000001X)_NW~2!K

literal 0
HcmV?d00001

diff --git a/tests/pkg-srcs/example_1.0-1+absurd.dsc b/tests/pkg-srcs/example_1.0-1+absurd.dsc
new file mode 100644
index 00000000..1ab743dd
--- /dev/null
+++ b/tests/pkg-srcs/example_1.0-1+absurd.dsc
@@ -0,0 +1,22 @@
+Format: 3.0 (quilt)
+Source: example
+Binary: example
+Architecture: all
+Version: 1.0-1+absurd
+Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Standards-Version: 3.9.4.0
+Build-Depends: debhelper (>= 8)
+Package-List:
+ example deb devel extra arch=all
+Checksums-Sha1:
+ 2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz
+ 4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz
+ dafb6f0db0580179ff246dba1dc2892246e84a2c 1416 example_1.0-1+absurd.debian.tar.xz
+Checksums-Sha256:
+ ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz
+ a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz
+ 4003c34398894e46823bb3fda69f4351dbd5649e321259cde266a135f0428c51 1416 example_1.0-1+absurd.debian.tar.xz
+Files:
+ cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz
+ 599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz
+ 0e88c1ed094f09ee7bf57607132d55ee 1416 example_1.0-1+absurd.debian.tar.xz
diff --git a/tests/tests/absurd-gitapply b/tests/tests/absurd-gitapply
new file mode 100755
index 00000000..c7eea86c
--- /dev/null
+++ b/tests/tests/absurd-gitapply
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-archive example 1.0-1+absurd
+t-git-none
+
+t-expect-fail 'gbp pq import failed' \
+t-dgit --force-import-gitapply-no-absurd clone $p
+
+t-dgit clone $p
+
+cd $p
+grep moo moo
+
+echo ok.
-- 
2.30.2