aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

presubmit_support: Fix tests on Python 3.

Browse Source 
Bug: 1009814
Change-Id: I2c2a835fc4fa0a7fc9e68dfff680fb0beacb491e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1869535
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
changes/35/1869535/5
Edward Lemur 6 years ago committed by Commit Bot
parent bb1354e256
commit a834f39e21
6 changed files with 135 additions and 78 deletions
Show Stats Download Patch File Download Diff File

22
.vpython3
Unescape Escape View File

@ -1 +1,23 @@
python_version: "3.8" python_version: "3.8"
# Used by:
# auth.py
# gerrit_util.py
# git_cl.py
# my_activity.py
# TODO(crbug.com/1002153): Add ninjalog_uploader.py
wheel: <
name: "infra/python/wheels/httplib2-py3"
version: "version:0.13.1"
>
# Used by:
# my_activity.py
wheel: <
name: "infra/python/wheels/python-dateutil-py2_py3"
version: "version:2.7.3"
>
wheel: <
name: "infra/python/wheels/six-py2_py3"
version: "version:1.10.0"
>

15
gerrit_util.py
Unescape Escape View File

@ -12,8 +12,6 @@ from __future__ import print_function
import base64 import base64
import contextlib import contextlib
import cookielib
import httplib # Still used for its constants.
import httplib2 import httplib2
import json import json
import logging import logging
@ -27,8 +25,6 @@ import sys
import tempfile import tempfile
import time import time
import urllib import urllib
import urlparse
from cStringIO import StringIO
from multiprocessing.pool import ThreadPool from multiprocessing.pool import ThreadPool
import auth import auth
@ -37,6 +33,17 @@ import metrics
import metrics_utils import metrics_utils
import subprocess2 import subprocess2
if sys.version_info.major == 2:
import cookielib
import httplib
import urlparse
from cStringIO import StringIO
else:
import http.cookiejar as cookielib
import http.client as httplib
import urllib.parse as urlparse
from io import StringIO
LOGGER = logging.getLogger() LOGGER = logging.getLogger()
# With a starting sleep time of 1.5 seconds, 2^n exponential backoff, and seven # With a starting sleep time of 1.5 seconds, 2^n exponential backoff, and seven
# total tries, the sleep time between the first and last tries will be 94.5 sec. # total tries, the sleep time between the first and last tries will be 94.5 sec.

23
git_cl.py
Unescape Escape View File

@ -15,7 +15,6 @@ import base64
import collections import collections
import datetime import datetime
import glob import glob
import httplib
import httplib2 import httplib2
import itertools import itertools
import json import json
@ -30,9 +29,6 @@ import sys
import tempfile import tempfile
import textwrap import textwrap
import time import time
import urllib
import urllib2
import urlparse
import uuid import uuid
import webbrowser import webbrowser
import zlib import zlib
@ -58,6 +54,17 @@ import subcommand
import subprocess2 import subprocess2
import watchlists import watchlists
if sys.version_info.major == 2:
import httplib
import urllib2 as urllib_request
import urllib2 as urllib_error
import urlparse
else:
import http.client as httplib
import urllib.request as urllib_request
import urllib.error as urllib_error
import urllib.parse as urlparse
__version__ = '2.0' __version__ = '2.0'
# Traces for git push will be stored in a traces directory inside the # Traces for git push will be stored in a traces directory inside the
@ -3182,7 +3189,7 @@ def urlretrieve(source, destination):
This is necessary because urllib is broken for SSL connections via a proxy. This is necessary because urllib is broken for SSL connections via a proxy.
""" """
with open(destination, 'w') as f: with open(destination, 'w') as f:
f.write(urllib2.urlopen(source).read()) f.write(urllib_request.urlopen(source).read())
def hasSheBang(fname): def hasSheBang(fname):
@ -4655,7 +4662,7 @@ def GetTreeStatus(url=None):
'unknown' or 'unset'.""" 'unknown' or 'unset'."""
url = url or settings.GetTreeStatusUrl(error_ok=True) url = url or settings.GetTreeStatusUrl(error_ok=True)
if url: if url:
status = urllib2.urlopen(url).read().lower() status = urllib_request.urlopen(url).read().lower()
if status.find('closed') != -1 or status == '0': if status.find('closed') != -1 or status == '0':
return 'closed' return 'closed'
elif status.find('open') != -1 or status == '1': elif status.find('open') != -1 or status == '1':
@ -4669,7 +4676,7 @@ def GetTreeStatusReason():
with the reason for the tree to be opened or closed.""" with the reason for the tree to be opened or closed."""
url = settings.GetTreeStatusUrl() url = settings.GetTreeStatusUrl()
json_url = urlparse.urljoin(url, '/current?format=json') json_url = urlparse.urljoin(url, '/current?format=json')
connection = urllib2.urlopen(json_url) connection = urllib_request.urlopen(json_url)
status = json.loads(connection.read()) status = json.loads(connection.read())
connection.close() connection.close()
return status['message'] return status['message']
@ -5459,7 +5466,7 @@ def main(argv):
return dispatcher.execute(OptionParser(), argv) return dispatcher.execute(OptionParser(), argv)
except auth.LoginRequiredError as e: except auth.LoginRequiredError as e:
DieWithError(str(e)) DieWithError(str(e))
except urllib2.HTTPError as e: except urllib_error.HTTPError as e:
if e.code != 500: if e.code != 500:
raise raise
DieWithError( DieWithError(

32
presubmit_canned_checks.py
Unescape Escape View File

@ -5,6 +5,7 @@
"""Generic presubmit checks that can be reused by other presubmit checks.""" """Generic presubmit checks that can be reused by other presubmit checks."""
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import os as _os import os as _os
_HERE = _os.path.dirname(_os.path.abspath(__file__)) _HERE = _os.path.dirname(_os.path.abspath(__file__))
@ -245,7 +246,7 @@ def CheckGenderNeutral(input_api, output_api, source_file_filter=None):
submitted. submitted.
""" """
gendered_re = input_api.re.compile( gendered_re = input_api.re.compile(
'(^|\s|\(|\[)([Hh]e|[Hh]is|[Hh]ers?|[Hh]im|[Ss]he|[Gg]uys?)\\b') r'(^|\s|\(|\[)([Hh]e|[Hh]is|[Hh]ers?|[Hh]im|[Ss]he|[Gg]uys?)\\b')
errors = [] errors = []
for f in input_api.AffectedFiles(include_deletes=False, for f in input_api.AffectedFiles(include_deletes=False,
@ -570,7 +571,7 @@ def CheckTreeIsOpen(input_api, output_api,
return [] return []
try: try:
if json_url: if json_url:
connection = input_api.urllib2.urlopen(json_url) connection = input_api.urllib_request.urlopen(json_url)
status = input_api.json.loads(connection.read()) status = input_api.json.loads(connection.read())
connection.close() connection.close()
if not status['can_commit_freely']: if not status['can_commit_freely']:
@ -579,7 +580,7 @@ def CheckTreeIsOpen(input_api, output_api,
return [output_api.PresubmitError(short_text, long_text=long_text)] return [output_api.PresubmitError(short_text, long_text=long_text)]
else: else:
# TODO(bradnelson): drop this once all users are gone. # TODO(bradnelson): drop this once all users are gone.
connection = input_api.urllib2.urlopen(url) connection = input_api.urllib_request.urlopen(url)
status = connection.read() status = connection.read()
connection.close() connection.close()
if input_api.re.match(closed, status): if input_api.re.match(closed, status):
@ -821,7 +822,7 @@ def GetPylint(input_api, output_api, white_list=None, black_list=None,
The default white_list enforces looking only at *.py files. The default white_list enforces looking only at *.py files.
""" """
white_list = tuple(white_list or ('.*\.py$',)) white_list = tuple(white_list or (r'.*\.py$',))
black_list = tuple(black_list or input_api.DEFAULT_BLACK_LIST) black_list = tuple(black_list or input_api.DEFAULT_BLACK_LIST)
extra_paths_list = extra_paths_list or [] extra_paths_list = extra_paths_list or []
@ -867,8 +868,7 @@ def GetPylint(input_api, output_api, white_list=None, black_list=None,
input_api.logging.info('Running pylint on %d files', len(files)) input_api.logging.info('Running pylint on %d files', len(files))
input_api.logging.debug('Running pylint on: %s', files) input_api.logging.debug('Running pylint on: %s', files)
env = input_api.environ.copy() env = input_api.environ.copy()
env['PYTHONPATH'] = input_api.os_path.pathsep.join( env['PYTHONPATH'] = input_api.os_path.pathsep.join(extra_paths_list)
extra_paths_list).encode('utf8')
env.pop('VPYTHON_CLEAR_PYTHONPATH', None) env.pop('VPYTHON_CLEAR_PYTHONPATH', None)
input_api.logging.debug(' with extra PYTHONPATH: %r', extra_paths_list) input_api.logging.debug(' with extra PYTHONPATH: %r', extra_paths_list)
@ -936,7 +936,7 @@ def RunPylint(input_api, *args, **kwargs):
def CheckBuildbotPendingBuilds(input_api, output_api, url, max_pendings, def CheckBuildbotPendingBuilds(input_api, output_api, url, max_pendings,
ignored): ignored):
try: try:
connection = input_api.urllib2.urlopen(url) connection = input_api.urllib_request.urlopen(url)
raw_data = connection.read() raw_data = connection.read()
connection.close() connection.close()
except IOError: except IOError:
@ -1001,7 +1001,7 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
input_api.change.RepositoryRoot(), input_api.change.RepositoryRoot(),
owner_email, owner_email,
reviewers, reviewers,
fopen=file, fopen=open,
os_path=input_api.os_path, os_path=input_api.os_path,
email_postfix='', email_postfix='',
disable_color=True, disable_color=True,
@ -1126,7 +1126,7 @@ def PanProjectChecks(input_api, output_api,
# 2006-20xx string used on the oldest files. 2006-20xx is deprecated, but # 2006-20xx string used on the oldest files. 2006-20xx is deprecated, but
# tolerated on old files. # tolerated on old files.
current_year = int(input_api.time.strftime('%Y')) current_year = int(input_api.time.strftime('%Y'))
allowed_years = (str(s) for s in reversed(xrange(2006, current_year + 1))) allowed_years = (str(s) for s in reversed(range(2006, current_year + 1)))
years_re = '(' + '|'.join(allowed_years) + '|2006-2008|2006-2009|2006-2010)' years_re = '(' + '|'.join(allowed_years) + '|2006-2008|2006-2009|2006-2010)'
# The (c) is deprecated, but tolerate it until it's removed from all files. # The (c) is deprecated, but tolerate it until it's removed from all files.
@ -1155,7 +1155,10 @@ def PanProjectChecks(input_api, output_api,
snapshot_memory = [] snapshot_memory = []
def snapshot(msg): def snapshot(msg):
"""Measures & prints performance warning if a rule is running slow.""" """Measures & prints performance warning if a rule is running slow."""
if input_api.sys.version_info.major == 2:
dt2 = input_api.time.clock() dt2 = input_api.time.clock()
else:
dt2 = input_api.time.process_time()
if snapshot_memory: if snapshot_memory:
delta_ms = int(1000*(dt2 - snapshot_memory[0])) delta_ms = int(1000*(dt2 - snapshot_memory[0]))
if delta_ms > 500: if delta_ms > 500:
@ -1388,7 +1391,6 @@ def CheckChangedLUCIConfigs(input_api, output_api):
import base64 import base64
import json import json
import logging import logging
import urllib2
import auth import auth
import git_cl import git_cl
@ -1425,16 +1427,16 @@ def CheckChangedLUCIConfigs(input_api, output_api):
def request(endpoint, body=None): def request(endpoint, body=None):
api_url = ('https://%s/_ah/api/config/v1/%s' api_url = ('https://%s/_ah/api/config/v1/%s'
% (LUCI_CONFIG_HOST_NAME, endpoint)) % (LUCI_CONFIG_HOST_NAME, endpoint))
req = urllib2.Request(api_url) req = input_api.urllib_request.Request(api_url)
req.add_header('Authorization', 'Bearer %s' % acc_tkn.token) req.add_header('Authorization', 'Bearer %s' % acc_tkn.token)
if body is not None: if body is not None:
req.add_header('Content-Type', 'application/json') req.add_header('Content-Type', 'application/json')
req.add_data(json.dumps(body)) req.add_data(json.dumps(body))
return json.load(urllib2.urlopen(req)) return json.load(input_api.urllib_request.urlopen(req))
try: try:
config_sets = request('config-sets').get('config_sets') config_sets = request('config-sets').get('config_sets')
except urllib2.HTTPError as e: except input_api.urllib_error.HTTPError as e:
return [output_api.PresubmitError( return [output_api.PresubmitError(
'Config set request to luci-config failed', long_text=str(e))] 'Config set request to luci-config failed', long_text=str(e))]
if not config_sets: if not config_sets:
@ -1472,7 +1474,7 @@ def CheckChangedLUCIConfigs(input_api, output_api):
cs_to_files[cs].append({ cs_to_files[cs].append({
'path': file_path[len(dr):] if dr != '/' else file_path, 'path': file_path[len(dr):] if dr != '/' else file_path,
'content': base64.b64encode( 'content': base64.b64encode(
'\n'.join(f.NewContents()).encode('utf-8')) '\n'.join(f.NewContents()).encode('utf-8')).decode('utf-8')
}) })
outputs = [] outputs = []
for cs, f in cs_to_files.items(): for cs, f in cs_to_files.items():
@ -1480,7 +1482,7 @@ def CheckChangedLUCIConfigs(input_api, output_api):
# TODO(myjang): parallelize # TODO(myjang): parallelize
res = request( res = request(
'validate-config', body={'config_set': cs, 'files': f}) 'validate-config', body={'config_set': cs, 'files': f})
except urllib2.HTTPError as e: except input_api.urllib_error.HTTPError as e:
return [output_api.PresubmitError( return [output_api.PresubmitError(
'Validation request to luci-config failed', long_text=str(e))] 'Validation request to luci-config failed', long_text=str(e))]
for msg in res.get('messages', []): for msg in res.get('messages', []):

35
presubmit_support.py
Unescape Escape View File

@ -7,6 +7,7 @@
""" """
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
__version__ = '1.8.0' __version__ = '1.8.0'
@ -33,7 +34,6 @@ import sys # Parts exposed through API.
import tempfile # Exposed through the API. import tempfile # Exposed through the API.
import threading import threading
import time import time
import types
import unittest # Exposed through the API. import unittest # Exposed through the API.
from warnings import warn from warnings import warn
@ -542,9 +542,11 @@ class InputApi(object):
self.os_walk = os.walk self.os_walk = os.walk
self.re = re self.re = re
self.subprocess = subprocess self.subprocess = subprocess
self.sys = sys
self.tempfile = tempfile self.tempfile = tempfile
self.time = time self.time = time
self.unittest = unittest self.unittest = unittest
if sys.version_info.major == 2:
self.urllib2 = urllib2 self.urllib2 = urllib2
self.urllib_request = urllib_request self.urllib_request = urllib_request
self.urllib_error = urllib_error self.urllib_error = urllib_error
@ -575,7 +577,7 @@ class InputApi(object):
# TODO(dpranke): figure out a list of all approved owners for a repo # TODO(dpranke): figure out a list of all approved owners for a repo
# in order to be able to handle wildcard OWNERS files? # in order to be able to handle wildcard OWNERS files?
self.owners_db = owners.Database(change.RepositoryRoot(), self.owners_db = owners.Database(change.RepositoryRoot(),
fopen=file, os_path=self.os_path) fopen=open, os_path=self.os_path)
self.owners_finder = owners_finder.OwnersFinder self.owners_finder = owners_finder.OwnersFinder
self.verbose = verbose self.verbose = verbose
self.Command = CommandData self.Command = CommandData
@ -609,9 +611,9 @@ class InputApi(object):
if len(dir_with_slash) == 1: if len(dir_with_slash) == 1:
dir_with_slash = '' dir_with_slash = ''
return filter( return list(filter(
lambda x: normpath(x.AbsoluteLocalPath()).startswith(dir_with_slash), lambda x: normpath(x.AbsoluteLocalPath()).startswith(dir_with_slash),
self.change.AffectedFiles(include_deletes, file_filter)) self.change.AffectedFiles(include_deletes, file_filter)))
def LocalPaths(self): def LocalPaths(self):
"""Returns local paths of input_api.AffectedFiles().""" """Returns local paths of input_api.AffectedFiles()."""
@ -633,8 +635,9 @@ class InputApi(object):
" is deprecated and ignored" % str(include_deletes), " is deprecated and ignored" % str(include_deletes),
category=DeprecationWarning, category=DeprecationWarning,
stacklevel=2) stacklevel=2)
return filter(lambda x: x.IsTestableFile(), return list(filter(
self.AffectedFiles(include_deletes=False, **kwargs)) lambda x: x.IsTestableFile(),
self.AffectedFiles(include_deletes=False, **kwargs)))
def AffectedTextFiles(self, include_deletes=None): def AffectedTextFiles(self, include_deletes=None):
"""An alias to AffectedTestableFiles for backwards compatibility.""" """An alias to AffectedTestableFiles for backwards compatibility."""
@ -667,7 +670,7 @@ class InputApi(object):
""" """
if not source_file: if not source_file:
source_file = self.FilterSourceFile source_file = self.FilterSourceFile
return filter(source_file, self.AffectedTestableFiles()) return list(filter(source_file, self.AffectedTestableFiles()))
def RightHandSideLines(self, source_file_filter=None): def RightHandSideLines(self, source_file_filter=None):
"""An iterator over all text lines in "new" version of changed files. """An iterator over all text lines in "new" version of changed files.
@ -1094,11 +1097,11 @@ class Change(object):
Returns: Returns:
[AffectedFile(path, action), AffectedFile(path, action)] [AffectedFile(path, action), AffectedFile(path, action)]
""" """
affected = filter(file_filter, self._affected_files) affected = list(filter(file_filter, self._affected_files))
if include_deletes: if include_deletes:
return affected return affected
return filter(lambda x: x.Action() != 'D', affected) return list(filter(lambda x: x.Action() != 'D', affected))
def AffectedTestableFiles(self, include_deletes=None, **kwargs): def AffectedTestableFiles(self, include_deletes=None, **kwargs):
"""Return a list of the existing text files in a change.""" """Return a list of the existing text files in a change."""
@ -1107,8 +1110,9 @@ class Change(object):
" is deprecated and ignored" % str(include_deletes), " is deprecated and ignored" % str(include_deletes),
category=DeprecationWarning, category=DeprecationWarning,
stacklevel=2) stacklevel=2)
return filter(lambda x: x.IsTestableFile(), return list(filter(
self.AffectedFiles(include_deletes=False, **kwargs)) lambda x: x.IsTestableFile(),
self.AffectedFiles(include_deletes=False, **kwargs)))
def AffectedTextFiles(self, include_deletes=None): def AffectedTextFiles(self, include_deletes=None):
"""An alias to AffectedTestableFiles for backwards compatibility.""" """An alias to AffectedTestableFiles for backwards compatibility."""
@ -1445,9 +1449,9 @@ class PresubmitExecuter(object):
logging.debug('Running %s done.', function_name) logging.debug('Running %s done.', function_name)
self.more_cc.extend(output_api.more_cc) self.more_cc.extend(output_api.more_cc)
finally: finally:
map(os.remove, input_api._named_temporary_files) for f in input_api._named_temporary_files:
if not (isinstance(result, types.TupleType) or os.remove(f)
isinstance(result, types.ListType)): if not isinstance(result, (tuple, list)):
raise PresubmitFailure( raise PresubmitFailure(
'Presubmit functions must return a tuple or list') 'Presubmit functions must return a tuple or list')
for item in result: for item in result:
@ -1566,7 +1570,8 @@ def DoPresubmitChecks(change,
] ]
} }
gclient_utils.FileWrite(json_output, json.dumps(presubmit_results)) gclient_utils.FileWrite(
json_output, json.dumps(presubmit_results, sort_keys=True))
output.write('\n') output.write('\n')
for name, items in (('Messages', notifications), for name, items in (('Messages', notifications),

78
tests/presubmit_unittest.py
Unescape Escape View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env vpython3
# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
@ -7,7 +7,8 @@
# pylint: disable=no-member,E1103 # pylint: disable=no-member,E1103
import StringIO from __future__ import unicode_literals
import functools import functools
import itertools import itertools
import logging import logging
@ -19,7 +20,6 @@ import sys
import tempfile import tempfile
import time import time
import unittest import unittest
import urllib2
_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) _ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, _ROOT) sys.path.insert(0, _ROOT)
@ -38,6 +38,15 @@ import presubmit_support as presubmit
import scm import scm
import subprocess2 as subprocess import subprocess2 as subprocess
if sys.version_info.major == 2:
from cStringIO import StringIO
import urllib2 as urllib_request
BUILTIN_OPEN = '__builtin__.open'
else:
from io import StringIO
import urllib.request as urllib_request
BUILTIN_OPEN = 'builtins.open'
# Shortcut. # Shortcut.
presubmit_canned_checks = presubmit.presubmit_canned_checks presubmit_canned_checks = presubmit.presubmit_canned_checks
@ -163,11 +172,14 @@ index fe3de7b..54ae6e1 100755
mock.patch('scm.determine_scm').start() mock.patch('scm.determine_scm').start()
mock.patch('scm.GIT.GenerateDiff').start() mock.patch('scm.GIT.GenerateDiff').start()
mock.patch('subprocess2.Popen').start() mock.patch('subprocess2.Popen').start()
mock.patch('sys.stderr', StringIO.StringIO()).start() mock.patch('sys.stderr', StringIO()).start()
mock.patch('sys.stdout', StringIO.StringIO()).start() mock.patch('sys.stdout', StringIO()).start()
mock.patch('tempfile.NamedTemporaryFile').start() mock.patch('tempfile.NamedTemporaryFile').start()
mock.patch('multiprocessing.cpu_count', lambda: 2) mock.patch('multiprocessing.cpu_count', lambda: 2)
if sys.version_info.major == 2:
mock.patch('urllib2.urlopen').start() mock.patch('urllib2.urlopen').start()
else:
mock.patch('urllib.request.urlopen').start()
self.addCleanup(mock.patch.stopall) self.addCleanup(mock.patch.stopall)
def checkstdout(self, value): def checkstdout(self, value):
@ -631,7 +643,7 @@ def CheckChangeOnCommit(input_api, output_api):
] ]
} }
fake_result_json = json.dumps(fake_result) fake_result_json = json.dumps(fake_result, sort_keys=True)
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change=change, committing=False, verbose=True, change=change, committing=False, verbose=True,
@ -657,7 +669,7 @@ def CheckChangeOnCommit(input_api, output_api):
# Make a change with a single warning. # Make a change with a single warning.
change = self.ExampleChange(extra_lines=['PROMPT_WARNING=yes']) change = self.ExampleChange(extra_lines=['PROMPT_WARNING=yes'])
input_buf = StringIO.StringIO('n\n') # say no to the warning input_buf = StringIO('n\n') # say no to the warning
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change=change, committing=False, verbose=True, change=change, committing=False, verbose=True,
output_stream=None, input_stream=input_buf, output_stream=None, input_stream=input_buf,
@ -666,7 +678,7 @@ def CheckChangeOnCommit(input_api, output_api):
self.assertFalse(output.should_continue()) self.assertFalse(output.should_continue())
self.assertEqual(output.getvalue().count('??'), 2) self.assertEqual(output.getvalue().count('??'), 2)
input_buf = StringIO.StringIO('y\n') # say yes to the warning input_buf = StringIO('y\n') # say yes to the warning
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change=change, committing=False, verbose=True, change=change, committing=False, verbose=True,
output_stream=None, input_stream=input_buf, output_stream=None, input_stream=input_buf,
@ -740,7 +752,7 @@ def CheckChangeOnCommit(input_api, output_api):
lambda d: [] if d == self.fake_root_dir else ['PRESUBMIT.py']) lambda d: [] if d == self.fake_root_dir else ['PRESUBMIT.py'])
random.randint.return_value = 0 random.randint.return_value = 0
input_buf = StringIO.StringIO('y\n') input_buf = StringIO('y\n')
change = self.ExampleChange(extra_lines=['STORY=http://tracker/123']) change = self.ExampleChange(extra_lines=['STORY=http://tracker/123'])
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
@ -820,7 +832,7 @@ def CheckChangeOnCommit(input_api, output_api):
'try2.cr': {'linux2': set(['defaulttests'])}, 'try2.cr': {'linux2': set(['defaulttests'])},
} }
for permutation in itertools.permutations(parts): for permutation in itertools.permutations(parts):
self.assertEqual(expected, reduce(merge, permutation, {})) self.assertEqual(expected, functools.reduce(merge, permutation, {}))
def testDoGetTryMasters(self): def testDoGetTryMasters(self):
root_text = (self.presubmit_trymaster root_text = (self.presubmit_trymaster
@ -844,12 +856,12 @@ def CheckChangeOnCommit(input_api, output_api):
change = presubmit.Change( change = presubmit.Change(
'mychange', '', self.fake_root_dir, [], 0, 0, None) 'mychange', '', self.fake_root_dir, [], 0, 0, None)
output = StringIO.StringIO() output = StringIO()
self.assertEqual({'t1.cr': {'win': ['defaulttests']}}, self.assertEqual({'t1.cr': {'win': ['defaulttests']}},
presubmit.DoGetTryMasters(change, [filename], presubmit.DoGetTryMasters(change, [filename],
self.fake_root_dir, self.fake_root_dir,
None, None, False, output)) None, None, False, output))
output = StringIO.StringIO() output = StringIO()
expected = { expected = {
't1.cr': {'win': ['defaulttests'], 'linux1': ['t1']}, 't1.cr': {'win': ['defaulttests'], 'linux1': ['t1']},
't2.cr': {'linux2': ['defaulttests']}, 't2.cr': {'linux2': ['defaulttests']},
@ -1084,7 +1096,7 @@ class InputApiUnittest(PresubmitTestsBase):
self.assertEqual(len(input_api.DEFAULT_WHITE_LIST), 24) self.assertEqual(len(input_api.DEFAULT_WHITE_LIST), 24)
self.assertEqual(len(input_api.DEFAULT_BLACK_LIST), 12) self.assertEqual(len(input_api.DEFAULT_BLACK_LIST), 12)
for item in files: for item in files:
results = filter(input_api.FilterSourceFile, item[0]) results = list(filter(input_api.FilterSourceFile, item[0]))
for i in range(len(results)): for i in range(len(results)):
self.assertEqual(results[i].LocalPath(), self.assertEqual(results[i].LocalPath(),
presubmit.normpath(item[1][i])) presubmit.normpath(item[1][i]))
@ -1289,33 +1301,33 @@ class OutputApiUnittest(PresubmitTestsBase):
self.assertIsNotNone(output.should_continue()) self.assertIsNotNone(output.should_continue())
self.assertIsNotNone(output.getvalue().count('?see?')) self.assertIsNotNone(output.getvalue().count('?see?'))
output = presubmit.PresubmitOutput(input_stream=StringIO.StringIO('y')) output = presubmit.PresubmitOutput(input_stream=StringIO('y'))
presubmit.OutputApi.PresubmitPromptWarning('???').handle(output) presubmit.OutputApi.PresubmitPromptWarning('???').handle(output)
output.prompt_yes_no('prompt: ') output.prompt_yes_no('prompt: ')
self.assertIsNotNone(output.should_continue()) self.assertIsNotNone(output.should_continue())
self.assertIsNotNone(output.getvalue().count('???')) self.assertIsNotNone(output.getvalue().count('???'))
output = presubmit.PresubmitOutput(input_stream=StringIO.StringIO('\n')) output = presubmit.PresubmitOutput(input_stream=StringIO('\n'))
presubmit.OutputApi.PresubmitPromptWarning('???').handle(output) presubmit.OutputApi.PresubmitPromptWarning('???').handle(output)
output.prompt_yes_no('prompt: ') output.prompt_yes_no('prompt: ')
self.assertFalse(output.should_continue()) self.assertFalse(output.should_continue())
self.assertIsNotNone(output.getvalue().count('???')) self.assertIsNotNone(output.getvalue().count('???'))
output_api = presubmit.OutputApi(True) output_api = presubmit.OutputApi(True)
output = presubmit.PresubmitOutput(input_stream=StringIO.StringIO('y')) output = presubmit.PresubmitOutput(input_stream=StringIO('y'))
output_api.PresubmitPromptOrNotify('???').handle(output) output_api.PresubmitPromptOrNotify('???').handle(output)
output.prompt_yes_no('prompt: ') output.prompt_yes_no('prompt: ')
self.assertIsNotNone(output.should_continue()) self.assertIsNotNone(output.should_continue())
self.assertIsNotNone(output.getvalue().count('???')) self.assertIsNotNone(output.getvalue().count('???'))
output_api = presubmit.OutputApi(False) output_api = presubmit.OutputApi(False)
output = presubmit.PresubmitOutput(input_stream=StringIO.StringIO('y')) output = presubmit.PresubmitOutput(input_stream=StringIO('y'))
output_api.PresubmitPromptOrNotify('???').handle(output) output_api.PresubmitPromptOrNotify('???').handle(output)
self.assertIsNotNone(output.should_continue()) self.assertIsNotNone(output.should_continue())
self.assertIsNotNone(output.getvalue().count('???')) self.assertIsNotNone(output.getvalue().count('???'))
output_api = presubmit.OutputApi(True) output_api = presubmit.OutputApi(True)
output = presubmit.PresubmitOutput(input_stream=StringIO.StringIO('\n')) output = presubmit.PresubmitOutput(input_stream=StringIO('\n'))
output_api.PresubmitPromptOrNotify('???').handle(output) output_api.PresubmitPromptOrNotify('???').handle(output)
output.prompt_yes_no('prompt: ') output.prompt_yes_no('prompt: ')
self.assertFalse(output.should_continue()) self.assertFalse(output.should_continue())
@ -1351,7 +1363,7 @@ class AffectedFileUnittest(PresubmitTestsBase):
f_blob = os.path.join(self.fake_root_dir, blob) f_blob = os.path.join(self.fake_root_dir, blob)
os.path.isfile.side_effect = lambda f: f in [f_blat, f_blob] os.path.isfile.side_effect = lambda f: f in [f_blat, f_blob]
output = filter(lambda x: x.IsTestableFile(), files) output = list(filter(lambda x: x.IsTestableFile(), files))
self.assertEqual(2, len(output)) self.assertEqual(2, len(output))
self.assertEqual(files[:2], output[:2]) self.assertEqual(files[:2], output[:2])
@ -1432,11 +1444,13 @@ class CannedChecksUnittest(PresubmitTestsBase):
input_api.os_path = os.path input_api.os_path = os.path
input_api.re = presubmit.re input_api.re = presubmit.re
input_api.gerrit = mock.MagicMock(presubmit.GerritAccessor) input_api.gerrit = mock.MagicMock(presubmit.GerritAccessor)
if sys.version_info.major == 2:
input_api.urllib2 = mock.MagicMock(presubmit.urllib2) input_api.urllib2 = mock.MagicMock(presubmit.urllib2)
input_api.urllib_request = mock.MagicMock(presubmit.urllib_request) input_api.urllib_request = mock.MagicMock(presubmit.urllib_request)
input_api.urllib_error = mock.MagicMock(presubmit.urllib_error) input_api.urllib_error = mock.MagicMock(presubmit.urllib_error)
input_api.unittest = unittest input_api.unittest = unittest
input_api.subprocess = subprocess input_api.subprocess = subprocess
input_api.sys = sys
class fake_CalledProcessError(Exception): class fake_CalledProcessError(Exception):
def __str__(self): def __str__(self):
return 'foo' return 'foo'
@ -1660,7 +1674,7 @@ class CannedChecksUnittest(PresubmitTestsBase):
'config_sets': [{'config_set': 'deadbeef', 'config_sets': [{'config_set': 'deadbeef',
'location': '%s/+/%s' % (host, branch)}] 'location': '%s/+/%s' % (host, branch)}]
} }
urllib2.urlopen.return_value = http_resp urllib_request.urlopen.return_value = http_resp
json.load.return_value = http_resp json.load.return_value = http_resp
mockChangelist().GetRemoteBranch.return_value = ('remote', branch) mockChangelist().GetRemoteBranch.return_value = ('remote', branch)
@ -1968,14 +1982,14 @@ the current line as well!
def testCannedCheckTreeIsOpenOpen(self): def testCannedCheckTreeIsOpenOpen(self):
input_api = self.MockInputApi(None, True) input_api = self.MockInputApi(None, True)
input_api.urllib2.urlopen().read.return_value = 'The tree is open' input_api.urllib_request.urlopen().read.return_value = 'The tree is open'
results = presubmit_canned_checks.CheckTreeIsOpen( results = presubmit_canned_checks.CheckTreeIsOpen(
input_api, presubmit.OutputApi, url='url_to_open', closed='.*closed.*') input_api, presubmit.OutputApi, url='url_to_open', closed='.*closed.*')
self.assertEqual(results, []) self.assertEqual(results, [])
def testCannedCheckTreeIsOpenClosed(self): def testCannedCheckTreeIsOpenClosed(self):
input_api = self.MockInputApi(None, True) input_api = self.MockInputApi(None, True)
input_api.urllib2.urlopen().read.return_value = ( input_api.urllib_request.urlopen().read.return_value = (
'Tree is closed for maintenance') 'Tree is closed for maintenance')
results = presubmit_canned_checks.CheckTreeIsOpen( results = presubmit_canned_checks.CheckTreeIsOpen(
input_api, presubmit.OutputApi, input_api, presubmit.OutputApi,
@ -1991,7 +2005,7 @@ the current line as well!
'general_state': 'open', 'general_state': 'open',
'message': 'The tree is open' 'message': 'The tree is open'
} }
input_api.urllib2.urlopen().read.return_value = json.dumps(status) input_api.urllib_request.urlopen().read.return_value = json.dumps(status)
results = presubmit_canned_checks.CheckTreeIsOpen( results = presubmit_canned_checks.CheckTreeIsOpen(
input_api, presubmit.OutputApi, json_url='url_to_open') input_api, presubmit.OutputApi, json_url='url_to_open')
self.assertEqual(results, []) self.assertEqual(results, [])
@ -2003,7 +2017,7 @@ the current line as well!
'general_state': 'closed', 'general_state': 'closed',
'message': 'The tree is close', 'message': 'The tree is close',
} }
input_api.urllib2.urlopen().read.return_value = json.dumps(status) input_api.urllib_request.urlopen().read.return_value = json.dumps(status)
results = presubmit_canned_checks.CheckTreeIsOpen( results = presubmit_canned_checks.CheckTreeIsOpen(
input_api, presubmit.OutputApi, json_url='url_to_closed') input_api, presubmit.OutputApi, json_url='url_to_closed')
self.assertEqual(len(results), 1) self.assertEqual(len(results), 1)
@ -2119,7 +2133,7 @@ the current line as well!
def testCheckBuildbotPendingBuildsBad(self): def testCheckBuildbotPendingBuildsBad(self):
input_api = self.MockInputApi(None, True) input_api = self.MockInputApi(None, True)
input_api.urllib2.urlopen().read.return_value = 'foo' input_api.urllib_request.urlopen().read.return_value = 'foo'
results = presubmit_canned_checks.CheckBuildbotPendingBuilds( results = presubmit_canned_checks.CheckBuildbotPendingBuilds(
input_api, presubmit.OutputApi, 'uurl', 2, ('foo')) input_api, presubmit.OutputApi, 'uurl', 2, ('foo'))
@ -2129,7 +2143,7 @@ the current line as well!
def testCheckBuildbotPendingBuildsGood(self): def testCheckBuildbotPendingBuildsGood(self):
input_api = self.MockInputApi(None, True) input_api = self.MockInputApi(None, True)
input_api.urllib2.urlopen().read.return_value = """ input_api.urllib_request.urlopen().read.return_value = """
{ {
'b1': { 'pending_builds': [0, 1, 2, 3, 4, 5, 6, 7] }, 'b1': { 'pending_builds': [0, 1, 2, 3, 4, 5, 6, 7] },
'foo': { 'pending_builds': [0, 1, 2, 3, 4, 5, 6, 7] }, 'foo': { 'pending_builds': [0, 1, 2, 3, 4, 5, 6, 7] },
@ -2155,7 +2169,7 @@ the current line as well!
os.path.exists = lambda _: True os.path.exists = lambda _: True
owners_file = StringIO.StringIO(owners_content) owners_file = StringIO(owners_content)
fopen = lambda *args: owners_file fopen = lambda *args: owners_file
input_api.owners_db = owners.Database('', fopen, os.path) input_api.owners_db = owners.Database('', fopen, os.path)
@ -2265,7 +2279,7 @@ the current line as well!
presubmit.OutputApi) presubmit.OutputApi)
for result in results: for result in results:
result.handle(output) result.handle(output)
if isinstance(expected_output, re._pattern_type): if expected_output:
self.assertRegexpMatches(output.getvalue(), expected_output) self.assertRegexpMatches(output.getvalue(), expected_output)
else: else:
self.assertEqual(output.getvalue(), expected_output) self.assertEqual(output.getvalue(), expected_output)
@ -2544,7 +2558,7 @@ the current line as well!
is_committing=False, is_committing=False,
uncovered_files=set()) uncovered_files=set())
@mock.patch('__builtin__.open', mock.mock_open(read_data='')) @mock.patch(BUILTIN_OPEN, mock.mock_open(read_data=''))
def testCannedRunUnitTests(self): def testCannedRunUnitTests(self):
change = presubmit.Change( change = presubmit.Change(
'foo1', 'description1', self.fake_root_dir, None, 0, 0, None) 'foo1', 'description1', self.fake_root_dir, None, 0, 0, None)
@ -2587,7 +2601,7 @@ the current line as well!
self.checkstdout('') self.checkstdout('')
@mock.patch('__builtin__.open', mock.mock_open()) @mock.patch(BUILTIN_OPEN, mock.mock_open())
def testCannedRunUnitTestsPython3(self): def testCannedRunUnitTestsPython3(self):
open().readline.return_value = '#!/usr/bin/env python3' open().readline.return_value = '#!/usr/bin/env python3'
change = presubmit.Change( change = presubmit.Change(
@ -2643,7 +2657,7 @@ the current line as well!
self.checkstdout('') self.checkstdout('')
@mock.patch('__builtin__.open', mock.mock_open()) @mock.patch(BUILTIN_OPEN, mock.mock_open())
def testCannedRunUnitTestsDontRunOnPython2(self): def testCannedRunUnitTestsDontRunOnPython2(self):
open().readline.return_value = '#!/usr/bin/env python3' open().readline.return_value = '#!/usr/bin/env python3'
change = presubmit.Change( change = presubmit.Change(
@ -2687,7 +2701,7 @@ the current line as well!
self.checkstdout('') self.checkstdout('')
@mock.patch('__builtin__.open', mock.mock_open()) @mock.patch(BUILTIN_OPEN, mock.mock_open())
def testCannedRunUnitTestsDontRunOnPython3(self): def testCannedRunUnitTestsDontRunOnPython3(self):
open().readline.return_value = '#!/usr/bin/env python3' open().readline.return_value = '#!/usr/bin/env python3'
change = presubmit.Change( change = presubmit.Change(

Write Preview
Loading…
Cancel
Save