|
|
|
#!/usr/bin/env vpython3
|
Fix UTF-8 output in gclient_utils.CheckCallAndFilter
Hooks for Electron output UTF-8 characters.
Example error for when "✔" is output:
File "/home/markus/depot_tools/metrics.py", line 266, in print_notice_and_exit
yield
File "/home/markus/depot_tools/gclient.py", line 3112, in <module>
sys.exit(main(sys.argv[1:]))
File "/home/markus/depot_tools/gclient.py", line 3098, in main
return dispatcher.execute(OptionParser(), argv)
File "/home/markus/depot_tools/subcommand.py", line 252, in execute
return command(parser, args[1:])
File "/home/markus/depot_tools/gclient.py", line 2677, in CMDsync
ret = client.RunOnDeps('update', args)
File "/home/markus/depot_tools/gclient.py", line 1746, in RunOnDeps
self.RunHooksRecursively(self._options, pm)
File "/home/markus/depot_tools/gclient.py", line 1052, in RunHooksRecursively
hook.run()
File "/home/markus/depot_tools/gclient.py", line 245, in run
cmd, cwd=self.effective_cwd, always=self._verbose)
File "/home/markus/depot_tools/gclient_utils.py", line 344, in CheckCallAndFilterAndHeader
return CheckCallAndFilter(args, **kwargs)
File "/home/markus/depot_tools/gclient_utils.py", line 576, in CheckCallAndFilter
stdout.write(in_byte.decode())
File "/usr/lib/python2.7/encodings/utf_8.py", line 16, in decode
return codecs.utf_8_decode(input, errors, True)
UnicodeDecodeError: 'utf8' codec can't decode byte 0xe2 in position 0: unexpected end of data
This issue was introduced in CL:1524583.
Bug: 942522
Change-Id: I3c4355b925b34398c800d142f942531a829e0297
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1541334
Auto-Submit: Raul Tambre <raul@tambre.ee>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Raul Tambre <raul@tambre.ee>
6 years ago
|
|
|
# coding=utf-8
|
|
|
|
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
|
|
# found in the LICENSE file.
|
|
|
|
|
|
|
|
from __future__ import print_function
|
|
|
|
from __future__ import unicode_literals
|
|
|
|
|
|
|
|
import io
|
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
import time
|
|
|
|
import unittest
|
|
|
|
|
|
|
|
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
|
|
|
|
|
|
from testing_support import trial_dir
|
|
|
|
from third_party import mock
|
|
|
|
|
|
|
|
import gclient_utils
|
|
|
|
import subprocess2
|
|
|
|
|
|
|
|
|
|
|
|
class CheckCallAndFilterTestCase(unittest.TestCase):
|
|
|
|
class ProcessIdMock(object):
|
|
|
|
def __init__(self, test_string, return_code=0):
|
|
|
|
self.stdout = io.BytesIO(test_string.encode('utf-8'))
|
|
|
|
self.pid = 9284
|
|
|
|
self.return_code = return_code
|
|
|
|
|
|
|
|
def wait(self):
|
|
|
|
return self.return_code
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
super(CheckCallAndFilterTestCase, self).setUp()
|
|
|
|
self.printfn = io.StringIO()
|
|
|
|
self.stdout = io.BytesIO()
|
|
|
|
if sys.version_info.major == 2:
|
|
|
|
mock.patch('sys.stdout', self.stdout).start()
|
|
|
|
mock.patch('__builtin__.print', self.printfn.write).start()
|
|
|
|
else:
|
|
|
|
mock.patch('sys.stdout', mock.Mock()).start()
|
|
|
|
mock.patch('sys.stdout.buffer', self.stdout).start()
|
|
|
|
mock.patch('builtins.print', self.printfn.write).start()
|
|
|
|
mock.patch('sys.stdout.flush', lambda: None).start()
|
|
|
|
self.addCleanup(mock.patch.stopall)
|
|
|
|
|
|
|
|
@mock.patch('subprocess2.Popen')
|
|
|
|
def testCheckCallAndFilter(self, mockPopen):
|
|
|
|
cwd = 'bleh'
|
|
|
|
args = ['boo', 'foo', 'bar']
|
|
|
|
test_string = 'ahah\naccb\nallo\naddb\n✔'
|
|
|
|
|
|
|
|
mockPopen.return_value = self.ProcessIdMock(test_string)
|
|
|
|
|
|
|
|
line_list = []
|
|
|
|
result = gclient_utils.CheckCallAndFilter(
|
|
|
|
args, cwd=cwd, show_header=True, always_show_header=True,
|
|
|
|
filter_fn=line_list.append)
|
|
|
|
|
|
|
|
self.assertEqual(result, test_string.encode('utf-8'))
|
|
|
|
self.assertEqual(line_list, [
|
|
|
|
'________ running \'boo foo bar\' in \'bleh\'\n',
|
|
|
|
'ahah',
|
|
|
|
'accb',
|
|
|
|
'allo',
|
|
|
|
'addb',
|
|
|
|
'✔'])
|
|
|
|
self.assertEqual(self.stdout.getvalue(), b'')
|
|
|
|
|
|
|
|
mockPopen.assert_called_with(
|
|
|
|
args, cwd=cwd, stdout=subprocess2.PIPE, stderr=subprocess2.STDOUT,
|
|
|
|
bufsize=0)
|
|
|
|
|
|
|
|
@mock.patch('time.sleep')
|
|
|
|
@mock.patch('subprocess2.Popen')
|
|
|
|
def testCheckCallAndFilter_RetryOnce(self, mockPopen, mockTime):
|
|
|
|
cwd = 'bleh'
|
|
|
|
args = ['boo', 'foo', 'bar']
|
|
|
|
test_string = 'ahah\naccb\nallo\naddb\n✔'
|
|
|
|
|
|
|
|
mockPopen.side_effect = [
|
|
|
|
self.ProcessIdMock(test_string, 1),
|
|
|
|
self.ProcessIdMock(test_string, 0),
|
|
|
|
]
|
|
|
|
|
|
|
|
line_list = []
|
|
|
|
result = gclient_utils.CheckCallAndFilter(
|
|
|
|
args, cwd=cwd, show_header=True, always_show_header=True,
|
|
|
|
filter_fn=line_list.append, retry=True)
|
|
|
|
|
|
|
|
self.assertEqual(result, test_string.encode('utf-8'))
|
|
|
|
|
|
|
|
self.assertEqual(line_list, [
|
|
|
|
'________ running \'boo foo bar\' in \'bleh\'\n',
|
|
|
|
'ahah',
|
|
|
|
'accb',
|
|
|
|
'allo',
|
|
|
|
'addb',
|
|
|
|
'✔',
|
|
|
|
'________ running \'boo foo bar\' in \'bleh\' attempt 2 / 4\n',
|
|
|
|
'ahah',
|
|
|
|
'accb',
|
|
|
|
'allo',
|
|
|
|
'addb',
|
|
|
|
'✔',
|
|
|
|
])
|
|
|
|
|
|
|
|
mockTime.assert_called_with(gclient_utils.RETRY_INITIAL_SLEEP)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
mockPopen.mock_calls,
|
|
|
|
[
|
|
|
|
mock.call(
|
|
|
|
args, cwd=cwd, stdout=subprocess2.PIPE,
|
|
|
|
stderr=subprocess2.STDOUT, bufsize=0),
|
|
|
|
mock.call(
|
|
|
|
args, cwd=cwd, stdout=subprocess2.PIPE,
|
|
|
|
stderr=subprocess2.STDOUT, bufsize=0),
|
|
|
|
])
|
|
|
|
|
|
|
|
self.assertEqual(self.stdout.getvalue(), b'')
|
|
|
|
self.assertEqual(
|
|
|
|
self.printfn.getvalue(),
|
|
|
|
'WARNING: subprocess \'"boo" "foo" "bar"\' in bleh failed; will retry '
|
|
|
|
'after a short nap...')
|
|
|
|
|
|
|
|
@mock.patch('subprocess2.Popen')
|
Revert "gclient_utils: buffer output as bytestrings in Annotated"
This reverts commit 5d284fdf48ab00a873e710c6ab76818d5b54d2cc.
Reason for revert: breaks buildbots, crbug.com/1011982
Original change's description:
> gclient_utils: buffer output as bytestrings in Annotated
>
> In Python 3 byestrings and normal strings can't be concatenated.
> To fix this we buffer as bytestrings in the Annotated wrapper.
> We can't decode to a string because the output might come byte-by-byte, so it doesn't work with Unicode characters like ✔.
>
> Also had to update gclient_test.py, where double-wrapping stdout with Annotated caused made output not work and include_zero=True working caused other unintended side-effects.
>
> Example error from "fetch chromium":
> Traceback (most recent call last):
> File "C:\Google\depot_tools\gclient_scm.py", line 1045, in _Clone
> self._Run(clone_cmd, options, cwd=self._root_dir, retry=True,
> File "C:\Google\depot_tools\gclient_scm.py", line 1370, in _Run
> gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
> File "C:\Google\depot_tools\gclient_utils.py", line 583, in CheckCallAndFilter
> show_header_if_necessary(needs_header, attempt)
> File "C:\Google\depot_tools\gclient_utils.py", line 533, in show_header_if_necessary
> stdout_write(header.encode())
> File "C:\Google\depot_tools\gclient_utils.py", line 391, in write
> obj[0] += out
> TypeError: can only concatenate str (not "bytes") to str
>
> Bug: 984182
> Change-Id: If7037d30e9faf524f2405258281f6e6cd0bcdcae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1778745
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Auto-Submit: Raul Tambre <raul@tambre.ee>
TBR=dpranke@chromium.org,ehmaldonado@chromium.org,raul@tambre.ee
Change-Id: I5ea8d3249c58a3487996649a264bb5be059fe884
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1845500
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
|
|
|
def testCHeckCallAndFilter_PrintStdout(self, mockPopen):
|
|
|
|
cwd = 'bleh'
|
|
|
|
args = ['boo', 'foo', 'bar']
|
|
|
|
test_string = 'ahah\naccb\nallo\naddb\n✔'
|
|
|
|
|
|
|
|
mockPopen.return_value = self.ProcessIdMock(test_string)
|
|
|
|
|
|
|
|
result = gclient_utils.CheckCallAndFilter(
|
|
|
|
args, cwd=cwd, show_header=True, always_show_header=True,
|
|
|
|
print_stdout=True)
|
|
|
|
|
|
|
|
self.assertEqual(result, test_string.encode('utf-8'))
|
Revert "gclient_utils: buffer output as bytestrings in Annotated"
This reverts commit 5d284fdf48ab00a873e710c6ab76818d5b54d2cc.
Reason for revert: breaks buildbots, crbug.com/1011982
Original change's description:
> gclient_utils: buffer output as bytestrings in Annotated
>
> In Python 3 byestrings and normal strings can't be concatenated.
> To fix this we buffer as bytestrings in the Annotated wrapper.
> We can't decode to a string because the output might come byte-by-byte, so it doesn't work with Unicode characters like ✔.
>
> Also had to update gclient_test.py, where double-wrapping stdout with Annotated caused made output not work and include_zero=True working caused other unintended side-effects.
>
> Example error from "fetch chromium":
> Traceback (most recent call last):
> File "C:\Google\depot_tools\gclient_scm.py", line 1045, in _Clone
> self._Run(clone_cmd, options, cwd=self._root_dir, retry=True,
> File "C:\Google\depot_tools\gclient_scm.py", line 1370, in _Run
> gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
> File "C:\Google\depot_tools\gclient_utils.py", line 583, in CheckCallAndFilter
> show_header_if_necessary(needs_header, attempt)
> File "C:\Google\depot_tools\gclient_utils.py", line 533, in show_header_if_necessary
> stdout_write(header.encode())
> File "C:\Google\depot_tools\gclient_utils.py", line 391, in write
> obj[0] += out
> TypeError: can only concatenate str (not "bytes") to str
>
> Bug: 984182
> Change-Id: If7037d30e9faf524f2405258281f6e6cd0bcdcae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1778745
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Auto-Submit: Raul Tambre <raul@tambre.ee>
TBR=dpranke@chromium.org,ehmaldonado@chromium.org,raul@tambre.ee
Change-Id: I5ea8d3249c58a3487996649a264bb5be059fe884
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1845500
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
|
|
|
self.assertEqual(
|
|
|
|
self.stdout.getvalue().splitlines(),
|
|
|
|
[
|
|
|
|
b'________ running \'boo foo bar\' in \'bleh\'',
|
|
|
|
b'ahah',
|
|
|
|
b'accb',
|
|
|
|
b'allo',
|
|
|
|
b'addb',
|
|
|
|
b'\xe2\x9c\x94',
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
class SplitUrlRevisionTestCase(unittest.TestCase):
|
|
|
|
def testSSHUrl(self):
|
|
|
|
url = "ssh://test@example.com/test.git"
|
|
|
|
rev = "ac345e52dc"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
url = "ssh://example.com/test.git"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
url = "ssh://example.com/git/test.git"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
rev = "test-stable"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
url = "ssh://user-name@example.com/~/test.git"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
url = "ssh://user-name@example.com/~username/test.git"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
url = "git@github.com:dart-lang/spark.git"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
|
|
|
|
def testSVNUrl(self):
|
|
|
|
url = "svn://example.com/test"
|
|
|
|
rev = "ac345e52dc"
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision(url)
|
|
|
|
self.assertEqual(out_rev, None)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
|
|
|
|
self.assertEqual(out_rev, rev)
|
|
|
|
self.assertEqual(out_url, url)
|
|
|
|
|
|
|
|
|
|
|
|
class GClientUtilsTest(trial_dir.TestCase):
|
|
|
|
def testHardToDelete(self):
|
|
|
|
# Use the fact that tearDown will delete the directory to make it hard to do
|
|
|
|
# so.
|
|
|
|
l1 = os.path.join(self.root_dir, 'l1')
|
|
|
|
l2 = os.path.join(l1, 'l2')
|
|
|
|
l3 = os.path.join(l2, 'l3')
|
|
|
|
f3 = os.path.join(l3, 'f3')
|
|
|
|
os.mkdir(l1)
|
|
|
|
os.mkdir(l2)
|
|
|
|
os.mkdir(l3)
|
|
|
|
gclient_utils.FileWrite(f3, 'foo')
|
|
|
|
os.chmod(f3, 0)
|
|
|
|
os.chmod(l3, 0)
|
|
|
|
os.chmod(l2, 0)
|
|
|
|
os.chmod(l1, 0)
|
|
|
|
|
|
|
|
def testUpgradeToHttps(self):
|
|
|
|
values = [
|
|
|
|
['', ''],
|
|
|
|
[None, None],
|
|
|
|
['foo', 'https://foo'],
|
|
|
|
['http://foo', 'https://foo'],
|
|
|
|
['foo/', 'https://foo/'],
|
|
|
|
['ssh-svn://foo', 'ssh-svn://foo'],
|
|
|
|
['ssh-svn://foo/bar/', 'ssh-svn://foo/bar/'],
|
|
|
|
['codereview.chromium.org', 'https://codereview.chromium.org'],
|
|
|
|
['codereview.chromium.org/', 'https://codereview.chromium.org/'],
|
|
|
|
['http://foo:10000', 'http://foo:10000'],
|
|
|
|
['http://foo:10000/bar', 'http://foo:10000/bar'],
|
|
|
|
['foo:10000', 'http://foo:10000'],
|
|
|
|
['foo:', 'https://foo:'],
|
|
|
|
]
|
|
|
|
for content, expected in values:
|
|
|
|
self.assertEqual(
|
|
|
|
expected, gclient_utils.UpgradeToHttps(content))
|
|
|
|
|
|
|
|
def testParseCodereviewSettingsContent(self):
|
|
|
|
values = [
|
|
|
|
['# bleh\n', {}],
|
|
|
|
['\t# foo : bar\n', {}],
|
|
|
|
['Foo:bar', {'Foo': 'bar'}],
|
|
|
|
['Foo:bar:baz\n', {'Foo': 'bar:baz'}],
|
|
|
|
[' Foo : bar ', {'Foo': 'bar'}],
|
|
|
|
[' Foo : bar \n', {'Foo': 'bar'}],
|
|
|
|
['a:b\n\rc:d\re:f', {'a': 'b', 'c': 'd', 'e': 'f'}],
|
|
|
|
['an_url:http://value/', {'an_url': 'http://value/'}],
|
|
|
|
[
|
|
|
|
'CODE_REVIEW_SERVER : http://r/s',
|
|
|
|
{'CODE_REVIEW_SERVER': 'https://r/s'}
|
|
|
|
],
|
|
|
|
['VIEW_VC:http://r/s', {'VIEW_VC': 'https://r/s'}],
|
|
|
|
]
|
|
|
|
for content, expected in values:
|
|
|
|
self.assertEqual(
|
|
|
|
expected, gclient_utils.ParseCodereviewSettingsContent(content))
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
Revert "gclient_utils: buffer output as bytestrings in Annotated"
This reverts commit 5d284fdf48ab00a873e710c6ab76818d5b54d2cc.
Reason for revert: breaks buildbots, crbug.com/1011982
Original change's description:
> gclient_utils: buffer output as bytestrings in Annotated
>
> In Python 3 byestrings and normal strings can't be concatenated.
> To fix this we buffer as bytestrings in the Annotated wrapper.
> We can't decode to a string because the output might come byte-by-byte, so it doesn't work with Unicode characters like ✔.
>
> Also had to update gclient_test.py, where double-wrapping stdout with Annotated caused made output not work and include_zero=True working caused other unintended side-effects.
>
> Example error from "fetch chromium":
> Traceback (most recent call last):
> File "C:\Google\depot_tools\gclient_scm.py", line 1045, in _Clone
> self._Run(clone_cmd, options, cwd=self._root_dir, retry=True,
> File "C:\Google\depot_tools\gclient_scm.py", line 1370, in _Run
> gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
> File "C:\Google\depot_tools\gclient_utils.py", line 583, in CheckCallAndFilter
> show_header_if_necessary(needs_header, attempt)
> File "C:\Google\depot_tools\gclient_utils.py", line 533, in show_header_if_necessary
> stdout_write(header.encode())
> File "C:\Google\depot_tools\gclient_utils.py", line 391, in write
> obj[0] += out
> TypeError: can only concatenate str (not "bytes") to str
>
> Bug: 984182
> Change-Id: If7037d30e9faf524f2405258281f6e6cd0bcdcae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1778745
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Auto-Submit: Raul Tambre <raul@tambre.ee>
TBR=dpranke@chromium.org,ehmaldonado@chromium.org,raul@tambre.ee
Change-Id: I5ea8d3249c58a3487996649a264bb5be059fe884
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1845500
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
|
|
|
import unittest
|
|
|
|
unittest.main()
|
|
|
|
|
|
|
|
# vim: ts=2:sw=2:tw=80:et:
|