diff options
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rwxr-xr-x | tests/tests/multisuite | 53 |
2 files changed, 54 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index 0aaabed..cf37ca7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -25,7 +25,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, make Restrictions: x-dgit-git-only -Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt +Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, make diff --git a/tests/tests/multisuite b/tests/tests/multisuite new file mode 100755 index 0000000..01585f6 --- /dev/null +++ b/tests/tests/multisuite @@ -0,0 +1,53 @@ +#!/bin/bash +set -e +. tests/lib + +t-setup-import examplegit +t-tstunt-parsechangelog + +cd $p + +rsta=$(t-git-get-ref refs/remotes/dgit/dgit/stable) +rsid=$(t-git-get-ref refs/remotes/dgit/dgit/sid) + +multi-good () { + t-refs-same-start + t-refs-same refs/remotes/dgit/dgit/stable + t-ref-same-val "previous stable" $rsta + + t-refs-same-start + t-refs-same refs/remotes/dgit/dgit/sid + t-ref-same-val "previous sid" $rsid + + t-refs-same-start + t-refs-same refs/remotes/dgit/dgit/stable,sid + t-ref-same-val "previous combined" $rcombined +} + +t-dgit fetch stable,unstable + +rcombined=$(t-git-get-ref refs/remotes/dgit/dgit/stable,sid) + +multi-good + +cd .. + +t-dgit clone --no-rm-on-error $p stable,unstable ./$p.clone + +cd $p.clone + +multi-good + +cd .. + +t-dgit clone --no-rm-on-error $p stable ./$p.pull +cd $p.pull +git checkout -b x +git commit --allow-empty -m X +t-dgit pull stable,unstable + +multi-good + +t-has-parent-or-is HEAD $rcombined + +echo ok. |