From e9f102d97eb1c24b16b0c5641fcfd1fbc4c0be20 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 27 Jun 2019 19:57:12 +0100 Subject: [PATCH 1/1] test suite: Drop all testing of old tag formats, and compatibility This is quite old now. We are dropping support for it. The new tags came in in dgit 2.0 in October 2016. No version of dgit without them was in any Debian release. We don't expect there are any sites using old servers which do not support the new format, or anyone using a dgit client older than 2.x who cannot upgrade. Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- tests/lib | 10 ---------- tests/tests/drs-push-rejects | 1 - tests/tests/newtag-clone-nogit | 4 ---- tests/tests/oldnewtagalt | 25 ------------------------- tests/tests/oldtag-clone-nogit | 4 ---- tests/tests/overwrite-splitbrains | 1 - tests/tests/quilt-gbp | 5 ----- tests/tests/quilt-splitbrains | 2 -- tests/tests/rpush-quilt | 2 -- 10 files changed, 1 insertion(+), 55 deletions(-) delete mode 100755 tests/tests/newtag-clone-nogit delete mode 100755 tests/tests/oldnewtagalt delete mode 100755 tests/tests/oldtag-clone-nogit diff --git a/debian/tests/control b/debian/tests/control index 7186da1f..44f1b78b 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -68,7 +68,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 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 gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit 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 clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp 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 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/lib b/tests/lib index d7cf396a..248dca56 100644 --- a/tests/lib +++ b/tests/lib @@ -1099,7 +1099,6 @@ t-drs () { t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S " t-git-config dgit-distro.test-dummy.git-check true t-git-config dgit-distro.test-dummy.git-create true - t-git-config dgit-distro.test-dummy.dgit-tag-format new,old,maint cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/. cp $troot/suites $tmp/. cp $troot/suites $tmp/suites-master @@ -1121,15 +1120,6 @@ t-drs () { ln -sf /bin/true $drs_dispatch/policy-hook } -t-newtag () { - export tagpfx=archive/test-dummy - t-git-config dgit-distro.test-dummy.dgit-tag-format new,maint -} -t-oldtag () { - export tagpfx=test-dummy - t-git-config dgit-distro.test-dummy.dgit-tag-format old -} - t-dsd () { t-drs t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh" diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects index afaed4cf..4c4a0569 100755 --- a/tests/tests/drs-push-rejects +++ b/tests/tests/drs-push-rejects @@ -162,7 +162,6 @@ git commit --allow-empty -m 'Dummy update' mktag mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2 -t-newtag re-prep mktag mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2 diff --git a/tests/tests/newtag-clone-nogit b/tests/tests/newtag-clone-nogit deleted file mode 100755 index 915f9d3f..00000000 --- a/tests/tests/newtag-clone-nogit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e -. tests/lib -t-alt-test diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt deleted file mode 100755 index 6730918b..00000000 --- a/tests/tests/oldnewtagalt +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -. tests/lib - -t-setup-import examplegit -t-tstunt-parsechangelog - -cd $p - -test-push () { - t-commit "$1" - t-dgit -wgf build-source - t-dgit push -} - -for count in 1 2; do - t-oldtag - test-push "oldtag $count" - - t-newtag - test-push "newtag $count" -done - -t-ok - diff --git a/tests/tests/oldtag-clone-nogit b/tests/tests/oldtag-clone-nogit deleted file mode 100755 index 915f9d3f..00000000 --- a/tests/tests/oldtag-clone-nogit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e -. tests/lib -t-alt-test diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains index 06d1a987..815c207b 100755 --- a/tests/tests/overwrite-splitbrains +++ b/tests/tests/overwrite-splitbrains @@ -5,7 +5,6 @@ set -e t-tstunt-parsechangelog t-gbp-example-prep-no-ff -t-newtag t-dgit --quilt=gbp --dgit-view-save=split.b build-source diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index cf148f61..e502f6b2 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -25,11 +25,6 @@ t-gbp-example-prep t-expect-fail 'quilt fixup cannot be linear' \ t-dgit build-source -t-git-config dgit-distro.test-dummy.dgit-tag-format new -t-expect-fail 'requires split view so server needs to support' \ -t-dgit -wgf --quilt=gbp build-source -t-newtag - t-dgit --quilt=gbp --dgit-view-save=split.b1 build-source git rev-parse split.b1 diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains index 3ab4572d..f8d8091f 100755 --- a/tests/tests/quilt-splitbrains +++ b/tests/tests/quilt-splitbrains @@ -12,8 +12,6 @@ suitespecs+=' stable' t-tstunt-parsechangelog -t-newtag - # Easiest way to make a patches-unapplied but not-gbp tree is # to take the patches-unapplied tree and by-hand commit the .gitignore # changes as a debian patch. diff --git a/tests/tests/rpush-quilt b/tests/tests/rpush-quilt index 10df9ae4..bb49fc61 100755 --- a/tests/tests/rpush-quilt +++ b/tests/tests/rpush-quilt @@ -4,8 +4,6 @@ set -e t-tstunt-parsechangelog -t-newtag - t-gbp-example-prep t-dgit -wgf --quilt=gbp --dgit-view-save=split.b build-source -- 2.30.2