Add plyint back to travis and fix pylint errors

theandrewdavis · theandrewdavis · commit d8f5e56ff5f2 · 2016-07-06T08:40:50.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,13 +14,19 @@ python:
   - "pypy3"
 
 install:
-  - pip install pyflakes
+  - pip install pylint pyflakes
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 # install: "sudo apt-get install"
 # command to run tests, e.g. python setup.py test
 script:
   - python cpplint_unittest.py
   - python cpplint_clitest.py
-  - pyflakes cpplint.py
+  - python cpplint.py --help
+
   - pyflakes cpplint_unittest.py
-  - pyflakes cpplint_clitest.py
+  - pyflakes cpplint_clitest.py
+  - pyflakes cpplint.py
+
+  - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then pylint --max-locals=25 --max-line-length=100 --max-attributes=10 -d bad-indentation,invalid-name,too-many-statements,multiple-statements,global-statement,missing-docstring,too-many-branches,too-many-return-statements,too-many-arguments,fixme,bad-continuation,bad-option-value,redefined-builtin,too-few-public-methods,no-self-use,too-many-lines,too-many-function-args,unused-argument,anomalous-unicode-escape-in-string,too-many-boolean-expressions   cpplint.py; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then pylint --max-locals=25 --max-line-length=100 --max-attributes=10 -d bad-indentation,invalid-name,too-many-statements,multiple-statements,global-statement,missing-docstring,too-many-branches,too-many-return-statements,too-many-arguments,fixme,bad-continuation,bad-option-value,redefined-builtin,too-few-public-methods,no-self-use,too-many-lines,too-many-function-args,unused-argument,anomalous-unicode-escape-in-string,too-many-boolean-expressions   cpplint_clitest.py; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then pylint --max-locals=25 --max-line-length=120 --max-attributes=10 --max-public-methods=200 -d bad-indentation,invalid-name,too-many-statements,multiple-statements,global-statement,missing-docstring,too-many-branches,too-many-return-statements,too-many-arguments,fixme,bad-continuation,bad-option-value,redefined-builtin,too-few-public-methods,no-self-use,too-many-lines,too-many-function-args,unused-argument,protected-access,unused-variable,global-at-module-level,anomalous-unicode-escape-in-string   cpplint_unittest.py; fi
diff --git a/cpplint_clitest.py b/cpplint_clitest.py
@@ -61,6 +61,7 @@ class UsageTest(unittest.TestCase):
     def testHelp(self):
         (status, out, err) = RunShellCommand(BASE_CMD + ' --help')
         self.assertEqual(0, status)
+        self.assertEqual(b'', out)
         self.assertTrue(err.startswith(b'\nSyntax: cpplint'))
 
 
@@ -69,7 +70,8 @@ class SignatureTests(unittest.TestCase):
     Regression tests: The test starts a filetreewalker scanning for files name *.def
     Such files are expected to have as first line the argument
     to a cpplint invocation from within the same directory, as second line the
-    expected status code, and all other lines the expected systemerr output (two blank lines at end).
+    expected status code, and all other lines the expected systemerr output (two blank
+    lines at end).
     """
 
     def testChromiumSample(self):
@@ -89,12 +91,12 @@ def testProtobufSample(self):
 
     def testCodeliteSample(self):
         self.checkAllInFolder('./samples/codelite-sample', 1)
-    
+
     def checkAllInFolder(self, foldername, expectedDefs):
         # uncomment to show complete diff
         # self.maxDiff = None
         count = 0
-        for dirpath, dnames, fnames in os.walk(foldername):
+        for dirpath, _, fnames in os.walk(foldername):
             for f in fnames:
                 if f.endswith('.def'):
                     count += 1
