From e26989680f3c7f3f219e799c3a64f1e4ee3808ee Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 19:23:58 +0000 Subject: [PATCH] git-debrebase: test suite: gdr-*: use faketime to control dch dates This means that the dgit- and gdr-generated commits with dates from changelogs are all adjusted. This makes the gitk in the gdr tests look more like a real one would, so we can see if it's pretty. (It also makes it easier to debug the tests.) Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- tests/lib | 2 +- tests/setup/gdr-convert-gbp | 2 +- tests/tests/gdr-edits | 2 +- tests/tests/gdr-import-dgit | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 891c0c85..05ea2dbd 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -18,7 +18,7 @@ Restrictions: x-dgit-intree-only x-dgit-git-only Tests: gdr-edits gdr-import-dgit Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime Tests: gitattributes Tests-Directory: tests/tests diff --git a/tests/lib b/tests/lib index 6533a90b..8722522d 100644 --- a/tests/lib +++ b/tests/lib @@ -1005,7 +1005,7 @@ t-commit () { } t-dch-commit () { - dch "$@" + faketime @"${GIT_AUTHOR_DATE% *}" dch "$@" git commit -m "dch $*" debian/changelog } diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index 8a210371..d12351dc 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -3,7 +3,7 @@ set -e . tests/lib . $troot/lib-gdr -t-dependencies git-buildpackage libfile-fnmatch-perl +t-dependencies git-buildpackage libfile-fnmatch-perl faketime t-tstunt-parsechangelog diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index d82c2383..c3ccff12 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -2,7 +2,7 @@ set -e . tests/lib -t-dependencies git-buildpackage libfile-fnmatch-perl +t-dependencies git-buildpackage libfile-fnmatch-perl faketime t-setup-import gdr-convert-gbp diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index 3d8d954a..c1e9ba9b 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -2,7 +2,7 @@ set -e . tests/lib -t-dependencies git-buildpackage libfile-fnmatch-perl +t-dependencies git-buildpackage libfile-fnmatch-perl faketime t-setup-import gdr-convert-gbp -- 2.30.2