From 39ae9e0589506313a69abf7a85155085b1d1147b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jun 2018 23:24:22 +0100
Subject: test suite: git-debrebase: Rename gdr-newupstream-v0 test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/tests/control           |  2 +-
 tests/tests/gdr-newupstream    | 65 ++++++++++++++++++++++++++++++++++++++++++
 tests/tests/gdr-newupstream-v0 | 65 ------------------------------------------
 3 files changed, 66 insertions(+), 66 deletions(-)
 create mode 100755 tests/tests/gdr-newupstream
 delete mode 100755 tests/tests/gdr-newupstream-v0

diff --git a/debian/tests/control b/debian/tests/control
index dcc40a7..595ee3f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcom
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime
 
-Tests: gdr-newupstream-v0 gdr-viagit
+Tests: gdr-newupstream gdr-viagit
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime
 
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
new file mode 100755
index 0000000..536f49c
--- /dev/null
+++ b/tests/tests/gdr-newupstream
@@ -0,0 +1,65 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-dependencies NO-DGIT GDR
+
+t-setup-import gdr-convert-gbp-noarchive
+
+cd $p
+
+: 'upstream hat'
+
+new-upstream () {
+	uv=$1
+	t-git-next-date
+	git checkout make-upstream
+	git reset --hard upstream
+	t-make-new-upstream-tarball $uv
+	git push . make-upstream:upstream
+	git checkout master
+	t-git-next-date
+}
+
+new-upstream 2.1
+
+: 'maintainer hat'
+
+git branch startpoint
+v=2.1-1
+
+git checkout master
+
+t-expect-fail F:'Could not determine appropriate upstream commitish' \
+t-git-debrebase new-upstream $v
+
+git tag v2.1 upstream
+
+t-git-debrebase new-upstream $v
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+git branch ordinary
+
+: 'with --anchor'
+
+git reset --hard startpoint
+
+t-git-debrebase analyse >../anal.anch
+anchor=$(perl <../anal.anch -ne '
+	next unless m/^(\w+) Anchor\s/;
+	print $1,"\n";
+	exit;
+')
+
+t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+git diff --quiet ordinary
+
+t-ok
diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
deleted file mode 100755
index 536f49c..0000000
--- a/tests/tests/gdr-newupstream-v0
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-set -e
-. tests/lib
-
-t-dependencies NO-DGIT GDR
-
-t-setup-import gdr-convert-gbp-noarchive
-
-cd $p
-
-: 'upstream hat'
-
-new-upstream () {
-	uv=$1
-	t-git-next-date
-	git checkout make-upstream
-	git reset --hard upstream
-	t-make-new-upstream-tarball $uv
-	git push . make-upstream:upstream
-	git checkout master
-	t-git-next-date
-}
-
-new-upstream 2.1
-
-: 'maintainer hat'
-
-git branch startpoint
-v=2.1-1
-
-git checkout master
-
-t-expect-fail F:'Could not determine appropriate upstream commitish' \
-t-git-debrebase new-upstream $v
-
-git tag v2.1 upstream
-
-t-git-debrebase new-upstream $v
-t-gdr-good laundered
-
-t-git-debrebase stitch
-t-gdr-good stitched
-
-git branch ordinary
-
-: 'with --anchor'
-
-git reset --hard startpoint
-
-t-git-debrebase analyse >../anal.anch
-anchor=$(perl <../anal.anch -ne '
-	next unless m/^(\w+) Anchor\s/;
-	print $1,"\n";
-	exit;
-')
-
-t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
-t-gdr-good laundered
-
-t-git-debrebase stitch
-t-gdr-good stitched
-
-git diff --quiet ordinary
-
-t-ok
-- 
cgit v1.2.3