Largely reduce the number of pylint warnings and fix one typo.
Most of them are style issues or variable aliasing.
TEST=Can almost enable pylint warnings
BUG=none
Review URL: http://codereview.chromium.org/4360002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@64908 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index a075d86..f49b2d8 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -17,6 +17,7 @@
# Fixes include path.
from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
+import sys
import gclient_scm
# Shortcut since this function is used often
@@ -789,11 +790,11 @@
end = ('] test\n 1 files changed, 1 insertions(+), '
'1 deletions(-)\n\n_____ . at refs/heads/master\n'
'Attempting rebase onto refs/remotes/origin/master...\n')
- self.assertTrue(gclient_scm.sys.stdout.getvalue().startswith(start))
- self.assertTrue(gclient_scm.sys.stdout.getvalue().endswith(end))
- self.assertEquals(len(gclient_scm.sys.stdout.getvalue()),
+ self.assertTrue(sys.stdout.getvalue().startswith(start))
+ self.assertTrue(sys.stdout.getvalue().endswith(end))
+ self.assertEquals(len(sys.stdout.getvalue()),
len(start) + len(end) + 7)
- gclient_scm.sys.stdout.close()
+ sys.stdout.close()
def testUpdateNotGit(self):
if not self.enabled: