Skip to content

Commit

Permalink
Adjusted Lint Runner (#410)
Browse files Browse the repository at this point in the history
* Adjusted Lint Runner

* Adjusted Lint Runner
  • Loading branch information
johann8384 committed Dec 4, 2018
1 parent 746149c commit 2b68c4b
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 146 deletions.
1 change: 1 addition & 0 deletions .pylintrc
Expand Up @@ -60,6 +60,7 @@ confidence=
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
# disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,missing-docstring,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating
disable=R,C,W

[REPORTS]

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: python
python:
- "2.7"
install:
- pip install pylint ordereddict mysqlclient requests feedparser prometheus_client
- pip install pylint pylint_runner ordereddict mysqlclient requests feedparser prometheus_client
script:
- ./pylint-runner.py -s
- pylint_runner --rcfile .pylintrc
- ./tests.py
2 changes: 1 addition & 1 deletion collectors/0/pxc-collector.py
Expand Up @@ -22,7 +22,7 @@
ATTENTION: Only tested on Debian/Ubuntu systems.
"""

import MySQLdb as mysql
import MySQLdb as mysql # pylint: disable=import-error
import time
import sys
import os.path
Expand Down
2 changes: 1 addition & 1 deletion eos/tcollector_agent.py
Expand Up @@ -18,7 +18,7 @@
import threading
import traceback

import eossdk
import eossdk # pylint: disable=import-error

tracer = eossdk.Tracer("tcollectorAgent")
warn = tracer.trace0
Expand Down
132 changes: 0 additions & 132 deletions pylint-runner.py

This file was deleted.

2 changes: 1 addition & 1 deletion tcollector.py
Expand Up @@ -781,7 +781,7 @@ def send_data_via_http(self):
self.pick_connection()

url = self.build_http_url()
LOG.debug("Sending metrics to url", url)
LOG.debug("Sending metrics to url: %s", url)
req = urllib2.Request(url)
if self.http_username and self.http_password:
req.add_header("Authorization", "Basic %s"
Expand Down
18 changes: 9 additions & 9 deletions tests.py
Expand Up @@ -54,14 +54,14 @@ class TSDBlacklistingTests(unittest.TestCase):

def setUp(self):
# Stub out the randomness
self.random_shuffle = tcollector.random.shuffle
tcollector.random.shuffle = lambda x: x
self.random_shuffle = tcollector.random.shuffle # pylint: disable=maybe-no-member
tcollector.random.shuffle = lambda x: x # pylint: disable=maybe-no-member

def tearDown(self):
tcollector.random.shuffle = self.random_shuffle
tcollector.random.shuffle = self.random_shuffle # pylint: disable=maybe-no-member

def mkSenderThread(self, tsds):
return tcollector.SenderThread(None, True, tsds, False, {}, reconnectinterval=5)
return tcollector.SenderThread(None, True, tsds, False, {}, reconnectinterval=5) # pylint: disable=maybe-no-member

def test_blacklistOneConnection(self):
tsd = ("localhost", 4242)
Expand Down Expand Up @@ -107,13 +107,13 @@ def test_doublePickTwoConnections(self):
class UDPCollectorTests(unittest.TestCase):

def setUp(self):
if ('udp_bridge.py' not in tcollector.COLLECTORS):
if ('udp_bridge.py' not in tcollector.COLLECTORS): # pylint: disable=maybe-no-member
return

self.saved_exit = sys.exit
self.saved_stderr = sys.stderr
self.saved_stdout = sys.stdout
self.udp_bridge = tcollector.COLLECTORS['udp_bridge.py']
self.udp_bridge = tcollector.COLLECTORS['udp_bridge.py'] # pylint: disable=maybe-no-member
self.udp_globals = {}

sys.exit = lambda x: None
Expand Down Expand Up @@ -146,7 +146,7 @@ def run_bridge_test(self, udpInputLines, stdoutLines, stderrLines):
sys.stdout = self.saved_stdout

def test_populated(self):
self.assertIsInstance(self.udp_bridge, tcollector.Collector)
self.assertIsInstance(self.udp_bridge, tcollector.Collector) # pylint: disable=maybe-no-member
self.assertIsNone(self.udp_bridge.proc)
self.assertIn('main', self.udp_globals)

Expand Down Expand Up @@ -309,6 +309,6 @@ def test_multi_empty_line_put_cond(self):
if __name__ == '__main__':
cdir = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
'collectors')
tcollector.setup_python_path(cdir)
tcollector.populate_collectors(cdir)
tcollector.setup_python_path(cdir) # pylint: disable=maybe-no-member
tcollector.populate_collectors(cdir) # pylint: disable=maybe-no-member
sys.exit(unittest.main())

0 comments on commit 2b68c4b

Please sign in to comment.