Test suite: oldnewtagalt: New test

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

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a8f5deb5230eb947eea3dcd55f033e315dd4003c..488765c842e2679b045087e6d2166581049b1a1f 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -13,11 +13,6 @@ TESTS
 
 Want tests for
 
 
 Want tests for
 

- - start repo with old tag, push with new tag, run
-   "old" dgit to push again with new tag, push again with
-   old tag
-
-

  * Test all three new --quilt=unapplied|gbp|dpm
 
 
  * Test all three new --quilt=unapplied|gbp|dpm
 
 

diff --git a/debian/tests/control b/debian/tests/control
index e227e2b9d735cdcb394fc29b4e13efca14b8cfaf..df9fdf8972fb2e59e448871276858308a3f0baaa 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -21,7 +21,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts
 Restrictions: x-dgit-git-only
 
 Depends: dgit, dgit-infrastructure, devscripts
 Restrictions: x-dgit-git-only
 

-Tests: build-modes build-modes-asplit build-modes-gbp-asplit 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 inarchivecopy newtag-clone-nogit oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
+Tests: build-modes build-modes-asplit build-modes-gbp-asplit 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 inarchivecopy newtag-clone-nogit oldnewtagalt oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay

 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts
 
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts
 

diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt
new file mode 100755 (executable)
index 0000000..cb270b2
--- /dev/null
+++ b/tests/tests/oldnewtagalt
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-setup-import examplegit
+t-tstunt-parsechangelog
+
+cd $p
+
+test-push () {
+       t-commit "$1"
+       t-dgit build-source
+       t-dgit push
+}
+
+for count in 1 2; do
+       t-oldtag
+       test-push "oldtag $count"
+
+       t-newtag
+       test-push "newtag $count"
+done
+
+echo ok.
+