diff --git a/tests/test-mq-qimport-fail-cleanup.out b/tests/test-mq-qimport-fail-cleanup.out deleted file mode 100644 index 3177e3a7b14fbc6a263f2a3df8584e357dead911_dGVzdHMvdGVzdC1tcS1xaW1wb3J0LWZhaWwtY2xlYW51cC5vdXQ=..0000000000000000000000000000000000000000 --- a/tests/test-mq-qimport-fail-cleanup.out +++ /dev/null @@ -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 diff --git a/tests/test-mq-qimport-fail-cleanup b/tests/test-mq-qimport-fail-cleanup.t old mode 100755 new mode 100644 similarity index 0% rename from tests/test-mq-qimport-fail-cleanup rename to tests/test-mq-qimport-fail-cleanup.t index 3177e3a7b14fbc6a263f2a3df8584e357dead911_dGVzdHMvdGVzdC1tcS1xaW1wb3J0LWZhaWwtY2xlYW51cA==..8b12768b15e220fc87e640a676238ef8726db116_dGVzdHMvdGVzdC1tcS1xaW1wb3J0LWZhaWwtY2xlYW51cC50 --- a/tests/test-mq-qimport-fail-cleanup +++ b/tests/test-mq-qimport-fail-cleanup.t @@ -1,13 +1,3 @@ -#!/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' +Failed qimport of patches from files should cleanup by recording successfully +imported patches in series file. @@ -13,10 +3,19 @@ -cat >b.patch<<EOF -diff --git a/a b/a ---- a/a -+++ b/a -@@ -1,1 +1,2 @@ - a -+b -EOF + $ 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 + @@ -22,5 +21,9 @@ -echo -echo '#empty series' -hg qseries +empty series + + $ hg qseries + $ echo + + +qimport valid patch followed by invalid patch @@ -26,5 +29,8 @@ -echo -echo '#qimport valid patch followed by invalid patch' -hg qimport b.patch fakepatch + $ hg qimport b.patch fakepatch + adding b.patch to series file + abort: unable to read file fakepatch + [255] + $ echo + @@ -30,4 +36,5 @@ -echo -echo '#valid patches before fail added to series' -hg qseries +valid patches before fail added to series + + $ hg qseries + b.patch