git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date

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

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 9bb9983d7871fe542d7f8dbdd2a3f638ef9498b6..8a21037166e06a870778f113f284d7c1891ba150 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -95,6 +95,7 @@ t-setup-done '' "$(echo $p*) git mirror salsa aq" '
        . $troot/lib-gdr
        t-tstunt-parsechangelog
        p=example
+       t-git-next-date
 '
 
 t-ok

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 94fad3bbead11a62dcbb6d14cbc1cb9ba779850d..3ad82b835c26ffd7cbd84bae5061e2cf58a42a0c 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -9,15 +9,18 @@ t-setup-import gdr-convert-gbp
 cd $p
 
 nmu-upload-1 () {
+       t-git-next-date
        nmubranch=$1
        git checkout -f -b $nmubranch
        t-git-debrebase
        t-git-debrebase convert-to-gbp
+       t-git-next-date
        # now we are on a gbp patched-unapplied branch
 }
 
 
 nmu-upload-2 () {
+       t-git-next-date
        t-dch-commit -v $v -m "nmu $nmubranch $v"
        t-some-changes "nmu $numbranch $v"
        t-dch-commit -r sid
@@ -30,6 +33,7 @@ nmu-upload-2 () {
        dput -c $tmp/dput.cf test-dummy $c
 
        t-archive-process-incoming sid
+       t-git-next-date
        cd $p
        git checkout master
 }
@@ -44,7 +48,9 @@ nmu-upload-2
 : 'done the nmu, switching back to the maintainer hat'
 
 nmu-fold () {
+       t-git-next-date
        t-dgit fetch
+       t-git-next-date
        git merge --ff-only dgit/dgit/sid
 
        git diff --exit-code patch-queue/$nmubranch