test suite: gdr-fresh: Drop use of git-deborig and fix dependencies

b765388a4cea
  "test suite: Test dgit calling git-debrebase on new debianisation"
failed to update the test dependencies, and does not work in a formal
autopkgtest run because dgit is not installed.

Additionally, Because scripts in devscripts have their own individual
dependencies, and the dependencies for git-deborig differ between
stretch and sid, It is not reasonably possible to write a dependency
which allows git-deborig to work.  This is another reason why this
test does not work in a formal run (this time, failing only on
sid/buster).

So, drop use of git-deborig, and the resulting dependency on
devscripts.  (dgit and git-debrebase pull in devscripts anyway, so
that is academic.)

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

diff --git a/debian/tests/control b/debian/tests/control
index 3051e87a1237e8332a24ee417783bb8f23d881c0..51e00f4864c8ad18ec80ef7ee31d57a27dc9785e 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,15 +16,11 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 

-Tests: gdr-fresh
-Tests-Directory: tests/tests
-Depends: chiark-utils-bin, devscripts, git-debrebase, git-buildpackage, faketime
-

 Tests: gdr-merge-conflicts
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
 
 Tests: gdr-merge-conflicts
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
 

-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints

 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 

diff --git a/tests/tests/gdr-fresh b/tests/tests/gdr-fresh
index b1e73904390521190cac2335a05c0aeb2c986dad..0635a893d2efa4689c1b093b6ffbe21c36a75e74 100755 (executable)
--- a/tests/tests/gdr-fresh
+++ b/tests/tests/gdr-fresh
@@ -4,7 +4,7 @@ autoimport=
 . tests/lib
 . $troot/lib-gdr
 
 . tests/lib
 . $troot/lib-gdr
 

-t-dependencies NO-DGIT devscripts GDR
+t-dependencies GDR

 
 t-gdr-gbp-import-core
 
 
 t-gdr-gbp-import-core
 


@@ -23,7 +23,8 @@ t-git-next-date
 git checkout quilt-tip debian
 git commit -m 'initial debianisation'
 
 git checkout quilt-tip debian
 git commit -m 'initial debianisation'
 

-git-deborig
+git archive --prefix=example/ -o ../example_1.0.orig.tar v1.0
+gzip -1v ../example_1.0.orig.tar

 
 dgit-quilt-fixup-uses-gdr () {
        t-git-next-date
 
 dgit-quilt-fixup-uses-gdr () {
        t-git-next-date