git-debrebase: test suite: gdr-edits: check branch structure after last push

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index fb58bf9c08a1556d4297acc0af99e64c8a52bc6d..f6333073cdf0ad42fedcdb672b05c5fa73ba2b7c 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -19,10 +19,12 @@ t-gdr-branch-structure () {
        #   stitched
        #   patches
 
+       local etype netype
+
        case $state in
        laundered)      etype=Upstream  ;;
        stitched)       etype=Pseudomerge ;;
-       patches)        etype=XXX-TODO ;;
+       pushed)         etype=AddPatches; netype=Pseudomerge ;;
        esac
 
        t-git-debrebase analyse >../anal.check
@@ -52,6 +54,12 @@ t-gdr-branch-structure () {
                        git diff --quiet $expect..$cid -- ':debian/patches'
                        etype=Packaging
                        ;;
+               AddPatches/SAME)
+                       git diff --quiet $expect..$cid -- \
+                               ':.' ':!debian/patches'
+                       etype=$netype
+                       netype=Upstream
+                       ;;
                Changelog/Packaging|\
                Changelog/Upstream)
                        git diff --quiet $expect..$cid -- \

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 5388f0498bb5045a82ae638def762f65f24cd2c5..30786fee76f8d2245a630538d0b0faeceb5be8fd 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -45,6 +45,8 @@ t-gdr-branch-structure stitched
 
 t-dgit push-source
 
+t-gdr-branch-structure pushed
+
 : todo 'more tests: convert dgit import new upstream version'
 : todo 'more tests: convert dgit import same upstream version'
 : todo 'more tests: other maint updated, we must fetch'