Patchwork tests: clean up duplicated output in test-subrepo-recursion progress

login
register
mail settings
Submitter Pierre-Yves David
Date June 26, 2015, 9:35 p.m.
Message ID <351e6ed0c7b717306eaa.1435354514@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9795/
State Accepted
Headers show

Comments

Pierre-Yves David - June 26, 2015, 9:35 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435354414 25200
#      Fri Jun 26 14:33:34 2015 -0700
# Node ID 351e6ed0c7b717306eaa96b6dd2f19d82964bd86
# Parent  6368c51cfad6dc5f9c46369ed5e17cf8bd09efae
tests: clean up duplicated output in test-subrepo-recursion progress

We have fixed a bug where two progress instance were created and competed with
each other (in 95f490136e75). But we did not updated the non-hardlink section of
'test-subrepo-recursion.t'. This patch fixes it.
Matt Mackall - June 29, 2015, 10:43 p.m.
On Fri, 2015-06-26 at 14:35 -0700, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1435354414 25200
> #      Fri Jun 26 14:33:34 2015 -0700
> # Node ID 351e6ed0c7b717306eaa96b6dd2f19d82964bd86
> # Parent  6368c51cfad6dc5f9c46369ed5e17cf8bd09efae
> tests: clean up duplicated output in test-subrepo-recursion progress

Queued for default, thanks.

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
@@ -408,13 +408,10 @@  Note there's a slight output glitch on n
   archiving [===========================>               ] 2/3\r (no-eol) (esc)
   archiving [==========================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   linking [ <=>                                           ] 1\r (no-eol) (esc)
-                                                              \r (no-eol) (esc)
-  \r (no-eol) (esc)
-  linking [  <=>                                          ] 1cloning subrepo foo from $TESTTMP/repo/foo
   cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
 #endif
 
 Archive + subrepos uses '/' for all component separators