Reland of PyLint fixes for tools-webrtc and webrtc/tools

tools-webrtc/autoroller/unittests/roll_deps_test.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import glob
@@ skipping 31 matching lines @@
 
 
 class TestError(Exception):
   pass
 
 
 class FakeCmd(object):
   def __init__(self):
     self.expectations = []
 
-  def add_expectation(self, *args, **kwargs):
+  def AddExpectation(self, *args, **kwargs):
     returns = kwargs.pop('_returns', None)
     self.expectations.append((args, kwargs, returns))
 
   def __call__(self, *args, **kwargs):
     if not self.expectations:
       raise TestError('Got unexpected\n%s\n%s' % (args, kwargs))
     exp_args, exp_kwargs, exp_returns = self.expectations.pop(0)
     if args != exp_args or kwargs != exp_kwargs:
       message = 'Expected:\n  args: %s\n  kwargs: %s\n' % (exp_args, exp_kwargs)
       message += 'Got:\n  args: %s\n  kwargs: %s\n' % (args, kwargs)
       raise TestError(message)
     return exp_returns
 
 
 class TestRollChromiumRevision(unittest.TestCase):
   def setUp(self):
     self._output_dir = tempfile.mkdtemp()
     for test_file in glob.glob(os.path.join(SCRIPT_DIR, 'testdata', '*')):
       shutil.copy(test_file, self._output_dir)
     self._webrtc_depsfile = os.path.join(self._output_dir, 'DEPS')
     self._old_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.old')
     self._new_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.new')
 
     self.fake = FakeCmd()
-    self.old_RunCommand = getattr(roll_deps, '_RunCommand')
+    self.old_run_command = getattr(roll_deps, '_RunCommand')
     setattr(roll_deps, '_RunCommand', self.fake)
 
   def tearDown(self):
     shutil.rmtree(self._output_dir, ignore_errors=True)
     self.assertEqual(self.fake.expectations, [])
-    setattr(roll_deps, '_RunCommand', self.old_RunCommand)
+    setattr(roll_deps, '_RunCommand', self.old_run_command)
 
   def testUpdateDepsFile(self):
     new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'
 
     current_rev = TEST_DATA_VARS['chromium_revision']
     UpdateDepsFile(self._webrtc_depsfile, current_rev, new_rev, [])
     with open(self._webrtc_depsfile) as deps_file:
       deps_contents = deps_file.read()
       self.assertTrue(new_rev in deps_contents,
                       'Failed to find %s in\n%s' % (new_rev, deps_contents))
 
   def testParseDepsDict(self):
     with open(self._webrtc_depsfile) as deps_file:
       deps_contents = deps_file.read()
     local_scope = ParseDepsDict(deps_contents)
     vars_dict = local_scope['vars']
 
-    def assertVar(variable_name):
+    def AssertVar(variable_name):
       self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name])
-    assertVar('chromium_git')
-    assertVar('chromium_revision')
+    AssertVar('chromium_git')
+    AssertVar('chromium_revision')
     self.assertEquals(len(local_scope['deps']), 3)
     self.assertEquals(len(local_scope['deps_os']), 1)
 
   def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):
     entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing/gtest')
     self.assertEquals(len(entries), 1)
     self.assertEquals(entries[0], DEPS_ENTRIES['src/testing/gtest'])
 
   def testGetMatchingDepsEntriesHandlesSimilarStartingPaths(self):
     entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing')
@@ skipping 15 matching lines @@
     self.assertEquals(changed_deps[0].current_rev, BUILD_OLD_REV)
     self.assertEquals(changed_deps[0].new_rev, BUILD_NEW_REV)
 
     self.assertEquals(changed_deps[1].path, 'src/buildtools')
     self.assertEquals(changed_deps[1].current_rev, BUILDTOOLS_OLD_REV)
     self.assertEquals(changed_deps[1].new_rev, BUILDTOOLS_NEW_REV)
 
 
 def _SetupGitLsRemoteCall(cmd_fake, url, revision):
   cmd = ['git', 'ls-remote', url, revision]
-  cmd_fake.add_expectation(cmd, _returns=(revision, None))
+  cmd_fake.AddExpectation(cmd, _returns=(revision, None))
 
 
 if __name__ == '__main__':
   unittest.main()