diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 20:34:30 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | 2aae4d412bb65168a20231955eb3f3e0587d4628 (patch) | |
| tree | dfc9ecb33905c7ad96c5d894bfe60e7738b163fc /tests | |
| parent | 61d6570d98dcc929a2f12c2ad6396dd03321cd78 (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 10 | ||||
| -rwxr-xr-x | tests/tests/gdr-edits | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index cb93773..6d11009 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 2d596fc..d4e2a85 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' |