[PATCH] test-subrepo-recursion: more aggressively regex 'unzip -l' output for 10.10

Matt Harbison mharbison at attotech.com
Wed Jun 17 16:22:17 CDT 2015


# HG changeset patch
# User Matt Harbison <mharbison at attotech.com>
# Date 1434573925 14400
#      Wed Jun 17 16:45:25 2015 -0400
# Node ID aa175a4fdc8a208ed7d399eb8e6f47bbc2a00129
# Parent  695b93a79d171bbcc4ac47b1229918ce809a5d65
test-subrepo-recursion: more aggressively regex 'unzip -l' output for 10.10

The output on 10.10 looks like this:

    Length     Date   Time    Name
   --------    ----   ----    ----
        172  01-01-80 00:00   .hg_archival.txt
         10  01-01-80 00:00   .hgsub
         45  01-01-80 00:00   .hgsubstate
          3  01-01-80 00:00   x.txt
         10  01-01-80 00:00   foo/.hgsub
         45  01-01-80 00:00   foo/.hgsubstate
          9  01-01-80 00:00   foo/y.txt
          9  01-01-80 00:00   foo/bar/z.txt
   --------                   -------
        303                   8 files

(2 digit year, shorter -- separators and closer columns).  We don't care about
any of that, so ignore it.

diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -325,18 +325,18 @@ Test archiving to zip file (unzip output
 
   $ unzip -l ../archive.zip
   Archive:  ../archive.zip
-    Length      Date    Time    Name
-  ---------  ---------- -----   ----
-        172  ?????????? 00:00   .hg_archival.txt (glob)
-         10  ?????????? 00:00   .hgsub (glob)
-         45  ?????????? 00:00   .hgsubstate (glob)
-          3  ?????????? 00:00   x.txt (glob)
-         10  ?????????? 00:00   foo/.hgsub (glob)
-         45  ?????????? 00:00   foo/.hgsubstate (glob)
-          9  ?????????? 00:00   foo/y.txt (glob)
-          9  ?????????? 00:00   foo/bar/z.txt (glob)
-  ---------                     -------
-        303                     8 files
+    Length [ ]* Date [ ]* Time [ ]* Name (re)
+  [\- ]* (re)
+        172  [0-9:\- ]*  .hg_archival.txt (re)
+         10  [0-9:\- ]*  .hgsub (re)
+         45  [0-9:\- ]*  .hgsubstate (re)
+          3  [0-9:\- ]*  x.txt (re)
+         10  [0-9:\- ]*  foo/.hgsub (re)
+         45  [0-9:\- ]*  foo/.hgsubstate (re)
+          9  [0-9:\- ]*  foo/y.txt (re)
+          9  [0-9:\- ]*  foo/bar/z.txt (re)
+  [\- ]* (re)
+        303  [ ]*        8 files (re)
 
 Test archiving a revision that references a subrepo that is not yet
 cloned:


More information about the Mercurial-devel mailing list