diff options
| author |   Sitaram Chamarty <sitaram@atc.tcs.com> | 2012-01-17 20:31:52 +0530 |
|---|---|---|
| committer | Sitaram Chamarty <sitaram@atc.tcs.com> | 2012-01-17 20:31:52 +0530 |
| commit | 70a9ea5e16fc995409acc3d54219c197796fd5bf (patch) | |
| tree | 0d51813e5a567f862a50d5b3340ddd76746c1c43 | |
| parent | minor fixup to previous commit documenting merge-check (diff) | |
| download | gitolite-gentoo-70a9ea5e16fc995409acc3d54219c197796fd5bf.tar.gz gitolite-gentoo-70a9ea5e16fc995409acc3d54219c197796fd5bf.tar.bz2 gitolite-gentoo-70a9ea5e16fc995409acc3d54219c197796fd5bf.zip | |
reformatted my spanking new showcase tsh-based test script
| -rw-r--r-- | t/t12-merge-check | 79 |
1 files changed, 48 insertions, 31 deletions
diff --git a/t/t12-merge-check b/t/t12-merge-check index 87fceff..b4e935c 100644 --- a/t/t12-merge-check +++ b/t/t12-merge-check @@ -1,4 +1,4 @@ -# vim: syn=sh: +# vim: ft=sh: tsh pwd || die '## tsh not installed?' for wr in 0 1 @@ -25,51 +25,68 @@ do name "setup a merged push" - tsh "ls -al foo; !ok; /cannot access foo: No such file or directory/ - clone u1:foo; ok; /Cloning into/; /You appear to have cloned an empty/" + tsh " + ls -al foo; !ok; /cannot access foo: No such file or directory/ + clone u1:foo; ok; /Cloning into/ + /You appear to have cloned an empty/ + " cd foo - tsh "ls -Al; ok; /\.git/ - test-commit aa; ok; /1 files changed, 1 insertions/ - tag start; ok - push-om; ok; /new branch.*master.-..master/ - /create.delete ignored.*merge-check/ - checkout -b new; ok; /Switched to a new branch 'new'/ - test-commit bb cc; ok - checkout master; ok; /Switched to branch 'master'/ - test-commit dd ee; ok - git merge new; ok; /Merge made.*recursive/ - test-commit ff; ok - tag end; ok" + tsh " + ls -Al; ok; /\.git/ + test-commit aa; ok; /1 files changed, 1 insertions/ + tag start; ok + push-om; ok; /new branch.*master.-..master/ + /create.delete ignored.*merge-check/ + checkout -b new; ok; /Switched to a new branch 'new'/ + test-commit bb cc; ok + checkout master; ok; /Switched to branch 'master'/ + test-commit dd ee; ok + git merge new; ok; /Merge made.*recursive/ + test-commit ff; ok + tag end; ok + " name "push by u4 should fail" - tsh "push u4:foo master - /WM refs/heads/master foo u4 DENIED by fallthru/ - /To u4:foo/ - /remote rejected.*hook declined/ - /failed to push some refs/" + tsh " + push u4:foo master; /WM refs/heads/master foo u4 DENIED by fallthru/ + /To u4:foo/ + /remote rejected.*hook declined/ + /failed to push some refs/ + " name "push by u3 should succeed" - tsh "push u3:foo master; ok; /To u3:foo/; /master.-..master/" + tsh " + push u3:foo master; ok; /To u3:foo/; /master.-..master/ + " name "rewind by u3 should fail" - tsh "reset-h start; ok; /HEAD is now at .* aa / - push u3:foo +master; !ok; /rejected.*hook declined/; /failed to push some refs/" + tsh " + reset-h start; ok; /HEAD is now at .* aa / + push u3:foo +master; !ok; /rejected.*hook declined/ + /failed to push some refs/ + " name "rewind by u2 should succeed" - tsh "push u2:foo +master; ok; /To u2:foo/; /forced update/" + tsh " + push u2:foo +master; ok; /To u2:foo/ + /forced update/ + " name "push by u2 should fail" - tsh "reset-h end; ok; /HEAD is now at .* ff / - push u2:foo master - /WM refs/heads/master foo u2 DENIED by fallthru/ - /To u2:foo/ - /remote rejected.*hook declined/ - /failed to push some refs/" + tsh " + reset-h end; ok; /HEAD is now at .* ff / + push u2:foo master; /WM refs/heads/master foo u2 DENIED by fallthru/ + /To u2:foo/ + /remote rejected.*hook declined/ + /failed to push some refs/ + " name "push by u1 should succeed" - tsh "push u1:foo master; ok; /master.-..master/" + tsh " + push u1:foo master; ok; /master.-..master/ + " name INTERNAL done |