From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 21 Sep 2016 20:19:46 +0000 (+0100)
Subject: Test suite: oldnewtagalt: New test
X-Git-Tag: archive/debian/2.0~136
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=25f10ec62284ba2b0a3c21ee9c61b9cdddaf9002

Test suite: oldnewtagalt: New test

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

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a8f5deb5..488765c8 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -13,11 +13,6 @@ TESTS
 
 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
 
 
diff --git a/debian/tests/control b/debian/tests/control
index e227e2b9..df9fdf89 100644
--- 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
 
-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
 
diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt
new file mode 100755
index 00000000..cb270b26
--- /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.
+