From fec59578bccc836fd94c549d5c1d6ac0eeaba5af Mon Sep 17 00:00:00 2001
From: SidneyAn <ran1.an@intel.com>
Date: Fri, 24 Aug 2018 08:46:22 +0800
Subject: [PATCH] fix dependency path and requirement to enable tox

  fix dependency path in controllerconfig tox.ini and
add pylint version 1.9.3 to suite python version 2.7

Change-Id: Iab4fa545802cd1f650d750e86bc1f582ae6f4fc1
Closes-Bug: #1788534
---
 controllerconfig/controllerconfig/test-requirements.txt | 3 +--
 controllerconfig/controllerconfig/tox.ini               | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/controllerconfig/controllerconfig/test-requirements.txt b/controllerconfig/controllerconfig/test-requirements.txt
index 664e653578..681321cf13 100644
--- a/controllerconfig/controllerconfig/test-requirements.txt
+++ b/controllerconfig/controllerconfig/test-requirements.txt
@@ -1,4 +1,4 @@
-pylint
+pylint <=1.9.3;python_version<'3.0' 
 pytest
 mock
 coverage>=3.6
@@ -6,4 +6,3 @@ PyYAML>=3.10.0 # MIT
 os-testr>=0.8.0 # Apache-2.0
 testresources>=0.2.4 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
-
diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini
index 27402fde82..15eb95aaf3 100644
--- a/controllerconfig/controllerconfig/tox.ini
+++ b/controllerconfig/controllerconfig/tox.ini
@@ -7,7 +7,7 @@
 envlist = flake8, py27, pylint
 # Tox does not work if the path to the workdir is too long, so move it to /tmp
 toxworkdir = /tmp/{env:USER}_cctox
-wrsdir = {toxinidir}/../../../../../../..
+wrsdir = {toxinidir}/../../../..
 stxdir = {[tox]wrsdir}/stx
 
 [testenv]
@@ -24,7 +24,6 @@ deps = -r{toxinidir}/requirements.txt
 [testenv:pylint]
 basepython = python2.7
 deps = {[testenv]deps}
-        pylint
 commands = pylint {posargs} controllerconfig --rcfile=./pylint.rc --extension-pkg-whitelist=netifaces
 
 [testenv:flake8]