Enable py36 in gates

It also updates pylint.

Change-Id: Ifcc597bc4a6aabdb56588949af3b7cf4d52221af
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 4f7536dfb0f4d639d76de54e360e6ba47f51888a)

diff --git a/functest_kubernetes/test_k8stest.py b/functest_kubernetes/test_k8stest.py
index 81d9285..16b0f24 100644 (file)
--- 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 de2148a..5ea05ff 100644 (file)
--- 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 38925f1..9cbb88e 100644 (file)
--- 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