Patchwork tests: stabilize svn output

login
register
mail settings
Submitter Pierre-Yves David
Date March 11, 2016, 3:56 p.m.
Message ID <56E2EAC3.1090109@ens-lyon.org>
Download mbox | patch
Permalink /patch/13788/
State Accepted
Commit b65481675466da8ebb0ec695add7195d874a0135
Headers show

Comments

Pierre-Yves David - March 11, 2016, 3:56 p.m.
On 03/11/2016 03:44 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1457675259 0
> #      Fri Mar 11 05:47:39 2016 +0000
> # Node ID 54f8ba4e4c0fbb65563778c8891278e4f84e5005
> # Parent  1c658391b22fb4d98ccfb60c0e57315b55634117
> tests: stabilize svn output
>
> With 1.9.3 extra bits were appearing...

I've less failure with your patch, but still some, can you look into this?

    committing changelog
@@ -113,13 +113,13 @@
    source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
    converting: 4/6 revisions (66.67%)
    reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
-  scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc)
+  scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc)
    committing changelog
    0 branch to branch?e
    source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6
    converting: 5/6 revisions (83.33%)
    reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
-  scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc)
+  scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc)
    committing changelog
    reparent to file://*/svn-repo (glob)
    reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)

ERROR: test-convert-svn-encoding.t output changed
timeless - March 11, 2016, 5:49 p.m.
That failure is from:
changeset:   30149:d64fc4db7f44
user:        Anton Shestakov <av6@dwimlabs.net>
date:        Fri Mar 11 22:30:04 2016 +0800
summary:     convert: specify unit for ui.progress when scanning paths

he didn't update the tests properly and apparently the systems (like
my gcc112 until recently) didn't have enough svn to notice. not
surprising, setting up svn is not easy (no pip install available).
Pierre-Yves David - March 11, 2016, 8:55 p.m.
On 03/11/2016 05:49 PM, timeless wrote:
> That failure is from:
> changeset:   30149:d64fc4db7f44
> user:        Anton Shestakov <av6@dwimlabs.net>
> date:        Fri Mar 11 22:30:04 2016 +0800
> summary:     convert: specify unit for ui.progress when scanning paths
>
> he didn't update the tests properly and apparently the systems (like
> my gcc112 until recently) didn't have enough svn to notice. not
> surprising, setting up svn is not easy (no pip install available).

Ha true, fixed the clowncopter.

Patch

--- /home/pyd/src/mercurial-dev/tests/test-convert-svn-encoding.t
+++ /home/pyd/src/mercurial-dev/tests/test-convert-svn-encoding.t.err
@@ -57,55 +57,55 @@ 
    source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2
    converting: 1/6 revisions (16.67%)
    reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc)
-  scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc)
-  scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc)
+  scanning paths: /trunk/\xc3\xa0 0/3 paths (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 paths (33.33%) (esc)
+  scanning paths: /trunk/\xc3\xa9 2/3 paths (66.67%) (esc)
    committing files:
    \xc3\xa0/e\xcc\x81 (esc)
-  getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc)
+  getting files: \xc3\xa0/e\xcc\x81 1/2 files (50.00%) (esc)
    \xc3\xa9 (esc)
-  getting files: \xc3\xa9 2/2 (100.00%) (esc)
+  getting files: \xc3\xa9 2/2 files (100.00%) (esc)
    committing manifest
    committing changelog
    3 copy files
    source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3
    converting: 2/6 revisions (33.33%)
-  scanning paths: /trunk/\xc3\xa0 0/4 (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa0 0/4 paths (0.00%) (esc)
    gone from -1
    reparent to file://*/svn-repo (glob)
    reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xa8 1/4 (25.00%) (esc)
+  scanning paths: /trunk/\xc3\xa8 1/4 paths (25.00%) (esc)
    copied to \xc3\xa8 from \xc3\xa9@2 (esc)
-  scanning paths: /trunk/\xc3\xa9 2/4 (50.00%) (esc)
+  scanning paths: /trunk/\xc3\xa9 2/4 paths (50.00%) (esc)
    gone from -1
    reparent to file://*/svn-repo (glob)
    reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xb9 3/4 (75.00%) (esc)
+  scanning paths: /trunk/\xc3\xb9 3/4 paths (75.00%) (esc)
    mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc)
-  getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc)
-  getting files: \xc3\xa9 2/4 (50.00%) (esc)
+  getting files: \xc3\xa0/e\xcc\x81 1/4 files (25.00%) (esc)
+  getting files: \xc3\xa9 2/4 files (50.00%) (esc)
    committing files:
    \xc3\xa8 (esc)
-  getting files: \xc3\xa8 3/4 (75.00%) (esc)
+  getting files: \xc3\xa8 3/4 files (75.00%) (esc)
     \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc)
    \xc3\xb9/e\xcc\x81 (esc)
-  getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc)
+  getting files: \xc3\xb9/e\xcc\x81 4/4 files (100.00%) (esc)
     \xc3\xb9/e\xcc\x81: copy 
\xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc)
    committing manifest
    committing changelog
    2 remove files
    source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4
    converting: 3/6 revisions (50.00%)
-  scanning paths: /trunk/\xc3\xa8 0/2 (0.00%) (esc)
+  scanning paths: /trunk/\xc3\xa8 0/2 paths (0.00%) (esc)
    gone from -1
    reparent to file://*/svn-repo (glob)
    reparent to file://*/svn-repo/trunk (glob)
-  scanning paths: /trunk/\xc3\xb9 1/2 (50.00%) (esc)
+  scanning paths: /trunk/\xc3\xb9 1/2 paths (50.00%) (esc)
    gone from -1
    reparent to file://*/svn-repo (glob)
    reparent to file://*/svn-repo/trunk (glob)
-  getting files: \xc3\xa8 1/2 (50.00%) (esc)
-  getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc)
+  getting files: \xc3\xa8 1/2 files (50.00%) (esc)
+  getting files: \xc3\xb9/e\xcc\x81 2/2 files (100.00%) (esc)
    committing files:
    committing manifest