Patchwork test-subrepo-recursion: glob out all the date listed by unzip -l

login
register
mail settings
Submitter Pierre-Yves David
Date May 7, 2015, 9:59 p.m.
Message ID <5990eda556f80e1a2cd9.1431035954@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/8957/
State Accepted
Headers show

Comments

Pierre-Yves David - May 7, 2015, 9:59 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1431035822 25200
#      Thu May 07 14:57:02 2015 -0700
# Node ID 5990eda556f80e1a2cd94fda826e92311f9c5b50
# Parent  17ba4ccd20b48511b3d06ab47fb1b2faf31410d7
test-subrepo-recursion: glob out all the date listed by unzip -l

This date output is unstable (01-01-1980 vs 1980-01-01). As the test is not
about the modification date, we glob the data out.

Caught by buildbot.
Martin von Zweigbergk - May 7, 2015, 11:38 p.m.
Thanks, pushed to the clowncopter.

On Thu, May 7, 2015 at 3:02 PM Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1431035822 25200
> #      Thu May 07 14:57:02 2015 -0700
> # Node ID 5990eda556f80e1a2cd94fda826e92311f9c5b50
> # Parent  17ba4ccd20b48511b3d06ab47fb1b2faf31410d7
> test-subrepo-recursion: glob out all the date listed by unzip -l
>
> This date output is unstable (01-01-1980 vs 1980-01-01). As the test is not
> about the modification date, we glob the data out.
>
> Caught by buildbot.
>
> 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
> @@ -337,22 +337,25 @@ Test archiving to zip file (unzip output
>    archiving (foo/bar) [                                 ] 0/1\r (no-eol)
> (glob) (esc)
>    archiving (foo/bar) [                                 ] 0/1\r (no-eol)
> (glob) (esc)
>    archiving (foo/bar) [================================>] 1/1\r (no-eol)
> (glob) (esc)
>    archiving (foo/bar) [================================>] 1/1\r (no-eol)
> (glob) (esc)
>                                                                \r (no-eol)
> (esc)
> +
> +(unzip date formating is unstable, we do not care about it and glob it
> out)
> +
>    $ unzip -l ../archive.zip
>    Archive:  ../archive.zip
>      Length      Date    Time    Name
>    ---------  ---------- -----   ----
> -        172  01-01-1980 00:00   .hg_archival.txt
> -         10  01-01-1980 00:00   .hgsub
> -         45  01-01-1980 00:00   .hgsubstate
> -          3  01-01-1980 00:00   x.txt
> -         10  01-01-1980 00:00   foo/.hgsub
> -         45  01-01-1980 00:00   foo/.hgsubstate
> -          9  01-01-1980 00:00   foo/y.txt
> -          9  01-01-1980 00:00   foo/bar/z.txt
> +        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
>
>  Test archiving a revision that references a subrepo that is not yet
>  cloned:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

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
@@ -337,22 +337,25 @@  Test archiving to zip file (unzip output
   archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
   archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
   archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
   archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
+
+(unzip date formating is unstable, we do not care about it and glob it out)
+
   $ unzip -l ../archive.zip
   Archive:  ../archive.zip
     Length      Date    Time    Name
   ---------  ---------- -----   ----
-        172  01-01-1980 00:00   .hg_archival.txt
-         10  01-01-1980 00:00   .hgsub
-         45  01-01-1980 00:00   .hgsubstate
-          3  01-01-1980 00:00   x.txt
-         10  01-01-1980 00:00   foo/.hgsub
-         45  01-01-1980 00:00   foo/.hgsubstate
-          9  01-01-1980 00:00   foo/y.txt
-          9  01-01-1980 00:00   foo/bar/z.txt
+        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
 
 Test archiving a revision that references a subrepo that is not yet
 cloned: