Patchwork [1,of,3] tests: glob whitespace between path and OK in unzip(1) output

login
register
mail settings
Submitter Augie Fackler
Date July 15, 2016, 4:50 p.m.
Message ID <ac381c534b1d3ed4486c.1468601428@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/15884/
State Accepted
Headers show

Comments

Augie Fackler - July 15, 2016, 4:50 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1468601398 14400
#      Fri Jul 15 12:49:58 2016 -0400
# Node ID ac381c534b1d3ed4486c5a81e6b960e7d647d801
# Parent  ce2b8d5dca1c89f81fcbd456c8cdc6e18fd0c60e
tests: glob whitespace between path and OK in unzip(1) output

FreeBSD's unzip(1) uses tabs instead of a run of spaces.
Yuya Nishihara - July 17, 2016, 8:40 a.m.
On Fri, 15 Jul 2016 12:50:28 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1468601398 14400
> #      Fri Jul 15 12:49:58 2016 -0400
> # Node ID ac381c534b1d3ed4486c5a81e6b960e7d647d801
> # Parent  ce2b8d5dca1c89f81fcbd456c8cdc6e18fd0c60e
> tests: glob whitespace between path and OK in unzip(1) output

These look good to me. Queued, thanks.

Patch

diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -117,13 +117,13 @@  invalid arch type should give 404
   $ python getarchive.py "$TIP" zip > archive.zip
   $ unzip -t archive.zip
   Archive:  archive.zip
-      testing: test-archive-1701ef1f1510/.hg_archival.txt   OK
-      testing: test-archive-1701ef1f1510/.hgsub   OK
-      testing: test-archive-1701ef1f1510/.hgsubstate   OK
-      testing: test-archive-1701ef1f1510/bar   OK
-      testing: test-archive-1701ef1f1510/baz/bletch   OK
-      testing: test-archive-1701ef1f1510/foo   OK
-      testing: test-archive-1701ef1f1510/subrepo/sub   OK
+      testing: test-archive-1701ef1f1510/.hg_archival.txt*OK (glob)
+      testing: test-archive-1701ef1f1510/.hgsub*OK (glob)
+      testing: test-archive-1701ef1f1510/.hgsubstate*OK (glob)
+      testing: test-archive-1701ef1f1510/bar*OK (glob)
+      testing: test-archive-1701ef1f1510/baz/bletch*OK (glob)
+      testing: test-archive-1701ef1f1510/foo*OK (glob)
+      testing: test-archive-1701ef1f1510/subrepo/sub*OK (glob)
   No errors detected in compressed data of archive.zip.
 
 test that we can download single directories and files
@@ -235,9 +235,9 @@  rename them afterwards.
   $ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip
   $ unzip -t test.zip
   Archive:  test.zip
-      testing: test/bar                 OK
-      testing: test/baz/bletch          OK
-      testing: test/foo                 OK
+      testing: test/bar*OK (glob)
+      testing: test/baz/bletch*OK (glob)
+      testing: test/foo*OK (glob)
   No errors detected in compressed data of test.zip.
 
   $ hg archive -t tar - | tar tf - 2>/dev/null
diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -232,8 +232,8 @@  Archive contains largefiles
   ...     f.write(urllib2.urlopen(u).read())
   $ unzip -t archive.zip
   Archive:  archive.zip
-      testing: empty-default/.hg_archival.txt   OK
-      testing: empty-default/f1         OK
+      testing: empty-default/.hg_archival.txt*OK (glob)
+      testing: empty-default/f1*OK (glob)
   No errors detected in compressed data of archive.zip.
 
 test 'verify' with remotestore: