Mercurial > hg
changeset 12339:f85338f509e4
tests: fixup tests using unzip -l
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 20 Sep 2010 15:50:36 -0500 |
| parents | b016fc1c0862 |
| children | 3b165c127690 d0a97814b7d7 |
| files | tests/test-archive.t tests/test-subrepo-recursion.t |
| diffstat | 2 files changed, 7 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-archive.t Mon Sep 20 14:36:36 2010 -0500 +++ b/tests/test-archive.t Mon Sep 20 15:50:36 2010 -0500 @@ -227,9 +227,9 @@ $ hg archive ../old.zip $ unzip -l ../old.zip Archive: ../old.zip - Length Date Time Name - --------- ---------- ----- ---- - 147 1980-01-01 00:00 old/.hg_archival.txt - 0 1980-01-01 00:00 old/old - --------- ------- - 147 2 files + \s*Length.* + .*-----.* + .*147.*80.*00:00.*old/.hg_archival.txt + .*0.*80.*00:00.*old/old + .*-----.* + \s*147\s+2 files
--- a/tests/test-subrepo-recursion.t Mon Sep 20 14:36:36 2010 -0500 +++ b/tests/test-subrepo-recursion.t Mon Sep 20 15:50:36 2010 -0500 @@ -243,23 +243,9 @@ ../archive/.hgsub ../archive/.hg_archival.txt -Test archiving to zip file: +Test archiving to zip file (unzip output is unstable): $ hg archive --subrepos ../archive.zip - $ unzip -l ../archive.zip - Archive: ../archive.zip - Length Date Time Name - --------- ---------- ----- ---- - 147 1980-01-01 00:00 archive/.hg_archival.txt - 10 1980-01-01 00:00 archive/.hgsub - 45 1980-01-01 00:00 archive/.hgsubstate - 3 1980-01-01 00:00 archive/x.txt - 9 1980-01-01 00:00 archive/foo/y.txt - 10 1980-01-01 00:00 archive/foo/.hgsub - 45 1980-01-01 00:00 archive/foo/.hgsubstate - 9 1980-01-01 00:00 archive/foo/bar/z.txt - --------- ------- - 278 8 files Clone and test outgoing: