From 6faeb365e627108bbcd41136f3204cf69c5c8ca8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 8 Aug 2019 12:33:22 +0100 Subject: test suite: Use http git check for three existing tests At the very least we want at least one test which fails when check_for_git is nobbled ad-hoc [1] to return 1. "clone-nogit" fits that bill (verified experimentally). Pick two other tests to enable this for, roughly arbitrarily. (Two tests which chain to clone-nogit are affected too.) Of course we also want a test which fails when check_for_git falsely returns 0. We don't have one right now. Coming up... Signed-off-by: Ian Jackson --- debian/tests/control | 10 +++++++--- tests/tests/clone-gitnosuite | 2 ++ tests/tests/clone-nogit | 2 ++ tests/tests/gdr-import-dgit | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 850b35d..e348eb5 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -20,15 +20,19 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: ftpmasterapi-http +Tests: clone-gitnosuite clone-nogit drs-clone-nogit dsd-clone-nogit ftpmasterapi-http Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libhttp-server-simple-static-perl +Tests: gdr-import-dgit +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage, libhttp-server-simple-static-perl + Tests: gdr-merge-conflicts Tests-Directory: tests/tests Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage, quilt -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: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh 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, faketime, git-debrebase, git-buildpackage @@ -92,7 +96,7 @@ Tests: trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng -Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt +Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime diff --git a/tests/tests/clone-gitnosuite b/tests/tests/clone-gitnosuite index 83c996d..b85efdb 100755 --- a/tests/tests/clone-gitnosuite +++ b/tests/tests/clone-gitnosuite @@ -2,6 +2,8 @@ set -e . tests/lib +t-setup-import http-git-check + t-archive pari-extra 3-1 t-git-none cp -a $tmp/git/_template $dgitrepo diff --git a/tests/tests/clone-nogit b/tests/tests/clone-nogit index e99dac3..f36a7b6 100755 --- a/tests/tests/clone-nogit +++ b/tests/tests/clone-nogit @@ -2,6 +2,8 @@ set -e . tests/lib +t-setup-import http-git-check + t-archive pari-extra 3-1 t-git-none diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index e58ff32..1050f72 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -6,6 +6,7 @@ t-dependencies GDR t-tstunt-parsechangelog t-setup-import gdr-convert-gbp +t-setup-import http-git-check cd $p -- cgit v1.2.3