diff options
| -rw-r--r-- | tests/lib-gdr | 24 | ||||
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu | 19 |
2 files changed, 25 insertions, 18 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index d45759d..da119bc 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -202,3 +202,27 @@ t-maintainer-commit-some-changes () { t-git-next-date } + +t-nmu-reconciled-good () { + local nmutree=$1 + + : 'check that what we have is what is expected' + + git checkout -b compare.nmu origin/master~0 + git checkout $nmutree . + git rm -rf debian/patches + git commit -m 'rm patches nmu' + + git checkout -b compare.maintainer origin/master~0 + git checkout did.maintainer . + git rm -rf --ignore-unmatch debian/patches + git commit --allow-empty -m 'rm patches maintainer' + + git merge compare.nmu + git diff --quiet master + + : 'check that dgit still likes it' + + git checkout master + t-dgit -wgf quilt-fixup +} diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 9b37ca6..e647f80 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -56,24 +56,7 @@ t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched -: 'check that what we have is what is expected' -git checkout -b compare.nmu origin/master~0 -git checkout patch-queue/nmu . -git rm -rf debian/patches -git commit -m 'rm patches nmu' - -git checkout -b compare.maintainer origin/master~0 -git checkout did.maintainer . -git rm -rf --ignore-unmatch debian/patches -git commit --allow-empty -m 'rm patches maintainer' - -git merge compare.nmu -git diff --quiet master - -: 'check that dgit still likes it' - -git checkout master -t-dgit -wgf quilt-fixup +t-nmu-reconciled-good patch-queue/nmu t-ok |