From 2aae4d412bb65168a20231955eb3f3e0587d4628 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Feb 2018 20:34:30 +0000 Subject: [PATCH] git-debrebase: test suite: introduce t-gdr-good And abolish the two things it was made of. Signed-off-by: Ian Jackson --- tests/lib-gdr | 10 ++++------ tests/tests/gdr-edits | 9 +++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/lib-gdr b/tests/lib-gdr index cb937734..6d11009d 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -12,18 +12,16 @@ t-git-debrebase () { ' } -t-gdr-same-as-before () { - local beforetag=$1 - git diff ${beforetag-t.before} -- ':.' ':!debian/patches' -} - -t-gdr-branch-structure () { +t-gdr-good () { local state=$1 + local beforetag=$2 # say HEAD to skip this check # state should be one of # laundered # stitched # patches + git diff ${beforetag-t.before} -- ':.' ':!debian/patches' + local etype netype case $state in diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 2d596fc6..d4e2a85a 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -21,16 +21,13 @@ t-dch-commit -r sid git tag t.before t-git-debrebase -t-gdr-same-as-before -t-gdr-branch-structure laundered +t-gdr-good laundered t-git-debrebase stitch --prose=wombat -t-gdr-same-as-before -t-gdr-branch-structure stitched +t-gdr-good stitched t-dgit push-source -t-gdr-same-as-before -t-gdr-branch-structure pushed +t-gdr-good pushed : todo 'more tests: convert dgit import new upstream version' : todo 'more tests: convert dgit import same upstream version' -- 2.30.2