Mercurial > hg
changeset 12465:8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 26 Sep 2010 13:43:21 -0500 |
| parents | 3177e3a7b14f |
| children | 3160698100c6 |
| files | tests/test-mq-qimport-fail-cleanup tests/test-mq-qimport-fail-cleanup.out tests/test-mq-qimport-fail-cleanup.t |
| diffstat | 3 files changed, 40 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq-qimport-fail-cleanup Sun Sep 26 13:43:21 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -#!/bin/sh -#failed qimport of patches from files should cleanup by recording successfully -#imported patches in series file. - -echo "[extensions]" >> $HGRCPATH -echo "mq=" >> $HGRCPATH - -hg init repo -cd repo - -echo a > a -hg ci -Am'add a' - -cat >b.patch<<EOF -diff --git a/a b/a ---- a/a -+++ b/a -@@ -1,1 +1,2 @@ - a -+b -EOF - -echo -echo '#empty series' -hg qseries - -echo -echo '#qimport valid patch followed by invalid patch' -hg qimport b.patch fakepatch - -echo -echo '#valid patches before fail added to series' -hg qseries
--- a/tests/test-mq-qimport-fail-cleanup.out Sun Sep 26 13:43:21 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -adding a - -#empty series - -#qimport valid patch followed by invalid patch -adding b.patch to series file -abort: unable to read file fakepatch - -#valid patches before fail added to series -b.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-mq-qimport-fail-cleanup.t Sun Sep 26 13:43:21 2010 -0500 @@ -0,0 +1,40 @@ +Failed qimport of patches from files should cleanup by recording successfully +imported patches in series file. + + $ echo "[extensions]" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH + $ hg init repo + $ cd repo + $ echo a > a + $ hg ci -Am'add a' + adding a + $ cat >b.patch<<EOF + > diff --git a/a b/a + > --- a/a + > +++ b/a + > @@ -1,1 +1,2 @@ + > a + > +b + > EOF + $ echo + + +empty series + + $ hg qseries + $ echo + + +qimport valid patch followed by invalid patch + + $ hg qimport b.patch fakepatch + adding b.patch to series file + abort: unable to read file fakepatch + [255] + $ echo + + +valid patches before fail added to series + + $ hg qseries + b.patch