From bfacfb1f9c84a812e3a79befbd96f9570f9072aa Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 22 May 2017 04:04:06 +0200 Subject: Update test_vnf.py to support py3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I86dc83b1fc9205f7b8209d63e18439a7e05c646b Signed-off-by: Cédric Ollivier --- functest/tests/unit/core/test_vnf.py | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functest/tests/unit/core/test_vnf.py b/functest/tests/unit/core/test_vnf.py index e322773ed..ce8590400 100644 --- a/functest/tests/unit/core/test_vnf.py +++ b/functest/tests/unit/core/test_vnf.py @@ -146,12 +146,12 @@ class VnfBaseTesting(unittest.TestCase): def test_deploy_vnf_unimplemented(self): with self.assertRaises(Exception) as context: self.test.deploy_vnf() - self.assertTrue('VNF not deployed' in context.exception) + self.assertIn('VNF not deployed', str(context.exception)) def test_test_vnf_unimplemented(self): with self.assertRaises(Exception) as context: self.test.test_vnf()() - self.assertTrue('VNF not tested' in context.exception) + self.assertIn('VNF not tested', str(context.exception)) def test_parse_results_ex_ok(self): self.test.details['test_vnf']['status'] = 'PASS' diff --git a/tox.ini b/tox.ini index efaa8d6b6..bde3a9757 100644 --- a/tox.ini +++ b/tox.ini @@ -40,4 +40,4 @@ dirs = deps = -r{toxinidir}/requirements.py3.txt -r{toxinidir}/test-requirements.txt -commands = nosetests --exclude=test_vnf {[testenv:py35]dirs} +commands = nosetests {[testenv:py35]dirs} -- cgit 1.2.3-korg