summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib-gdr10
-rwxr-xr-xtests/tests/gdr-edits2
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr
index fb58bf9..f633307 100644
--- 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 5388f04..30786fe 100755
--- 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'