From 1838d519257aaa7127b71ff93be7e49946673025 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Thu, 24 Jan 2019 07:38:45 -0500
Subject: [PATCH] Fix spurious pylint import errors for ddt and mock
Set dependencies correctly for pylint job in tox.ini so
it does not report spurious E041 import errors on mock
and ddt modules. Also fix a reference to Cinder instead
of Manila in the pylint script.
Closes-Bug: #1813156
Change-Id: Ib160caae57e41a4d45483ff4faa599143e694abc
---
tools/coding-checks.sh | 2 +-
tox.ini | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/coding-checks.sh b/tools/coding-checks.sh
index 8a41223ee9..709f24e2ed 100755
--- a/tools/coding-checks.sh
+++ b/tools/coding-checks.sh
@@ -4,7 +4,7 @@ set -eu
usage() {
echo "Usage: $0 [OPTION]..."
- echo "Run Cinder's coding check(s)"
+ echo "Run Manila's coding check(s)"
echo ""
echo " -Y, --pylint [<basecommit>] Run pylint check on the entire manila module or just files changed in basecommit (e.g. HEAD~1)"
echo " -h, --help Print this usage message"
diff --git a/tox.ini b/tox.ini
index 9a0093be40..2e43889564 100644
--- a/tox.ini
+++ b/tox.ini
@@ -104,6 +104,7 @@ commands =
[testenv:pylint]
basepython = python3
deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
pylint==2.1.1
whitelist_externals = bash
commands = bash ./tools/coding-checks.sh --pylint {posargs}