Commit 14e37ad7 authored by maruel@chromium.org's avatar maruel@chromium.org

Silence pylint on Mac OSX 10.6

Also, increase the wait for socket binding to 0.2 seconds because OSX10.6 is
broken _and_ slow.

R=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/8749005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112277 0039d316-1c4b-4281-b951-d872f2087c98
parent 379d07a4
......@@ -110,7 +110,8 @@ def gen_parser():
"""
parser = optparse.OptionParser(version=__version__)
# Remove description formatting
parser.format_description = lambda x: parser.description
parser.format_description = (
lambda _: parser.description) # pylint: disable=E1101
# Add common parsing.
old_parser_args = parser.parse_args
......
......@@ -302,7 +302,8 @@ def main():
default='http://codereview.chromium.org',
help='Host to use, default is %default')
# Remove description formatting
parser.format_description = lambda x: parser.description
parser.format_description = (
lambda _: parser.description) # pylint: disable=E1101
options, args = parser.parse_args()
if args:
parser.error('Args unsupported')
......
......@@ -182,7 +182,8 @@ class Popen(subprocess.Popen):
fix('stderr')
self.start = time.time()
# Silence pylint on MacOSX
self.returncode = None
try:
super(Popen, self).__init__(args, **kwargs)
except OSError, e:
......
......@@ -124,7 +124,7 @@ def wait_for_port_to_bind(host, port, process):
# immediately, it fails with EINVAL and never gets a chance to
# connect (putting us into a hard spin and then failing).
# Linux doesn't need this.
time.sleep(0.1)
time.sleep(0.2)
try:
start = datetime.datetime.utcnow()
......
......@@ -125,9 +125,6 @@ class DefaultsTest(auto_stub.TestCase):
# Cleanup code in subprocess.py needs this member to be set.
# pylint: disable=W0201
proc._child_created = None
# Since subprocess.Popen.__init__() is not called, proc.returncode shouldn't
# be present.
self.assertFalse(hasattr(proc, 'returncode'))
expected = {
'args': ['foo'],
'a': True,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment