git-debrebase: test suite: introduce t-gdr-good

And abolish the two things it was made of.

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index cb937734dac3c205521683d9ffe6764c6b859e81..6d11009d8013ddf168d31a37a280d9f49fe76383 100644 (file)
--- 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 state=$1

+       local beforetag=$2 # say HEAD to skip this check

        # state should be one of
        #   laundered
        #   stitched
        #   patches
 
        # state should be one of
        #   laundered
        #   stitched
        #   patches
 

+       git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
+

        local etype netype
 
        case $state in
        local etype netype
 
        case $state in

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 2d596fc6a5cf2c637be6e07ab4429769abc85f78..d4e2a85a5bcc64644959b6bcb94eb60dab34ceea 100755 (executable)
--- 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
 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-git-debrebase stitch --prose=wombat

-t-gdr-same-as-before
-t-gdr-branch-structure stitched
+t-gdr-good stitched

 
 t-dgit push-source
 
 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'
 
 : todo 'more tests: convert dgit import new upstream version'
 : todo 'more tests: convert dgit import same upstream version'