Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gcloud/logging/test__gax.py
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,8 @@ class _DummyException(AbortionError):
code = status_code

def __init__(self):
pass
super(_DummyException, self).__init__(
None, None, self.code, None)

return _DummyException()

Expand Down
3 changes: 2 additions & 1 deletion gcloud/pubsub/test__gax.py
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,8 @@ class _DummyException(AbortionError):
code = status_code

def __init__(self):
pass
super(_DummyException, self).__init__(
None, None, self.code, None)

return _DummyException()

Expand Down
4 changes: 0 additions & 4 deletions scripts/run_pylint.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
]
IGNORED_FILES = [
os.path.join('docs', 'conf.py'),
# Both these files cause pylint 1.6 to barf. See:
# https://github.com/PyCQA/pylint/issues/998
os.path.join('gcloud', 'bigtable', 'happybase', 'connection.py'),
os.path.join('gcloud', 'streaming', 'http_wrapper.py'),
'setup.py',
]
SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,12 @@ commands =
python {toxinidir}/scripts/run_pylint.py
deps =
pep8
pylint
pylint >= 1.6.3
unittest2
psutil
Sphinx
setenv =
PYTHONPATH =
passenv = {[testenv:system-tests]passenv}

[testenv:system-tests]
Expand Down