aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-07-27 17:13:20 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-07-27 17:13:20 +0200
commit4f7536dfb0f4d639d76de54e360e6ba47f51888a (patch)
treeab638ff746161d3328b1944796d8f73d0134257a
parentf43e3cdcb121bb9229a15d464b021155305472cb (diff)
Enable py36 in gates
It also updates pylint. Change-Id: Ifcc597bc4a6aabdb56588949af3b7cf4d52221af Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest_kubernetes/test_k8stest.py8
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
3 files changed, 6 insertions, 6 deletions
diff --git a/functest_kubernetes/test_k8stest.py b/functest_kubernetes/test_k8stest.py
index 81d92853..16b0f246 100644
--- a/functest_kubernetes/test_k8stest.py
+++ b/functest_kubernetes/test_k8stest.py
@@ -38,8 +38,8 @@ class K8sTests(unittest.TestCase):
self.k8stesting.config = 'not_file'
with mock.patch.object(self.k8stesting,
'_K8sTesting__logger') as mock_logger:
- self.assertEquals(self.k8stesting.run(),
- testcase.TestCase.EX_RUN_ERROR)
+ self.assertEqual(self.k8stesting.run(),
+ testcase.TestCase.EX_RUN_ERROR)
mock_logger.error.assert_called_with(
"Cannot run k8s testcases. Config file not found")
mock_func.assert_called_with('not_file')
@@ -54,8 +54,8 @@ class K8sTests(unittest.TestCase):
@mock.patch('functest_kubernetes.k8stest.os.path.isfile')
@mock.patch('functest_kubernetes.k8stest.subprocess.Popen')
def test_run(self, *args):
- self.assertEquals(self.k8stesting.run(),
- testcase.TestCase.EX_OK)
+ self.assertEqual(self.k8stesting.run(),
+ testcase.TestCase.EX_OK)
for loop in range(3):
args[loop].assert_called()
diff --git a/test-requirements.txt b/test-requirements.txt
index de2148a8..5ea05ffa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@ coverage!=4.4 # Apache-2.0
mock # BSD
nose # LGPL
flake8<2.6.0,>=2.5.4 # MIT
-pylint==1.4.5 # GPLv2
+pylint # GPLv2
yamllint
ansible-lint
bashate # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d2f97093..eba93e44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27,bandit
+envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27,py36,bandit
[testenv]
usedevelop = True