Mercurial > hg
changeset 11907:863567a1364f
tests: use regular expressions instead of helpers
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Mon, 16 Aug 2010 10:58:03 +0900 |
| parents | 1219d019339d |
| children | 7f48f0b188c6 |
| files | tests/test-bookmarks-rebase.t tests/test-bookmarks-strip.t tests/test-mq.t |
| diffstat | 3 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-rebase.t Mon Aug 16 10:53:52 2010 +0900 +++ b/tests/test-bookmarks-rebase.t Mon Aug 16 10:58:03 2010 +0900 @@ -1,5 +1,3 @@ - $ . $TESTDIR/helpers.sh - $ echo "[extensions]" >> $HGRCPATH $ echo "rebase=" >> $HGRCPATH $ echo "bookmarks=" >> $HGRCPATH @@ -38,8 +36,8 @@ rebase - $ hg rebase -s two -d one 2>&1 | cleanrebase - saved backup bundle to + $ hg rebase -s two -d one + saved backup bundle to .* $ hg log changeset: 3:9163974d1cb5
--- a/tests/test-bookmarks-strip.t Mon Aug 16 10:53:52 2010 +0900 +++ b/tests/test-bookmarks-strip.t Mon Aug 16 10:58:03 2010 +0900 @@ -1,4 +1,3 @@ - $ . $TESTDIR/helpers.sh $ echo "[extensions]" >> $HGRCPATH $ echo "bookmarks=" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH @@ -50,8 +49,8 @@ strip to revision 1 - $ hg strip 1 | hidebackup - saved backup bundle to + $ hg strip 1 + saved backup bundle to .* list bookmarks
--- a/tests/test-mq.t Mon Aug 16 10:53:52 2010 +0900 +++ b/tests/test-mq.t Mon Aug 16 10:58:03 2010 +0900 @@ -1,5 +1,3 @@ - $ . $TESTDIR/helpers.sh - $ checkundo() > { > if [ -f .hg/store/undo ]; then @@ -733,9 +731,9 @@ $ echo x>x $ hg ci -Ama adding x - $ hg strip tip | hidebackup + $ hg strip tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - saved backup bundle to + saved backup bundle to .* $ hg unbundle .hg/strip-backup/* adding changesets adding manifests @@ -750,14 +748,14 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo y>y $ hg add y - $ hg strip tip | hidebackup + $ hg strip tip abort: local changes found --force strip with local changes - $ hg strip -f tip | hidebackup + $ hg strip -f tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - saved backup bundle to + saved backup bundle to .* cd b; hg qrefresh @@ -1110,9 +1108,9 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo - $ hg strip 1 | hidebackup + $ hg strip 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to + saved backup bundle to .* $ checkundo strip $ hg log changeset: 1:20cbbe65cff7