From 19669291927ee91dbea3c47a412161b32859df88 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 22 Oct 2016 11:16:36 +0100 Subject: default config: Switch to new archive/ tag format Even in non-split-brain mode. Also change the test suite to expect this. Signed-off-by: Ian Jackson --- tests/lib | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/lib') diff --git a/tests/lib b/tests/lib index 39763c6..5d8e742 100644 --- a/tests/lib +++ b/tests/lib @@ -65,7 +65,7 @@ incoming = $tmp/incoming run_dinstall = 0 END -: ${tagpfx:=test-dummy} +: ${tagpfx:=archive/test-dummy} : ${suitespecs:=sid:unstable} t-git-next-date () { @@ -825,7 +825,7 @@ 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 old,new + 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 @@ -852,6 +852,7 @@ t-newtag () { 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 } -- cgit v1.2.3