testing: fix mangled output during refresh (bug 1264203) r=gps draft
authorbyron jones <glob@mozilla.com>
Tue, 19 Apr 2016 22:11:14 +0800
changeset 8096 457dff30421dc6fdb79af061df968383e890d2b5
parent 8095 cddbd7bb87e2022cd923d09c15f19ebb89aaa31c
child 8097 822835220ece8e46304afe34024e09dc5c2670e2
push id821
push userbjones@mozilla.com
push dateThu, 12 May 2016 05:13:51 +0000
reviewersgps
bugs1264203
testing: fix mangled output during refresh (bug 1264203) r=gps MozReview-Commit-ID: 4rACNOp0beG
testing/vcttesting/mozreview.py
--- a/testing/vcttesting/mozreview.py
+++ b/testing/vcttesting/mozreview.py
@@ -361,17 +361,20 @@ class MozReview(object):
             url = 'rsync://%s:%s/vct-mount/' % (self._docker.docker_hostname,
                                                 rsync_port)
 
             def execute(name, cid, command):
                 res = self._docker.execute(cid, command, stream=True,
                                            stderr=verbose, stdout=verbose)
                 for msg in res:
                     if verbose:
-                        print('%s> %s' % (name, msg), end='')
+                        msg = msg.rstrip().lstrip('\n')
+                        for line in msg.splitlines():
+                            if line != '':
+                                print('%s> %s' % (name, line))
 
             def refresh(name, cid):
                 execute(name, cid, ['/refresh', url])
 
             with futures.ThreadPoolExecutor(4) as e:
                 e.submit(refresh, 'rbweb', self.rbweb_id)
                 e.submit(refresh, 'hgrb', self.hgrb_id)
                 # TODO add hgweb support for refreshing.