diff options
author | valentin boucher <valentin.boucher@orange.com> | 2017-05-22 16:28:47 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-05-22 16:28:47 +0000 |
commit | a32ee348efa6d5858cef97294a94d85bce63d456 (patch) | |
tree | be6ac8777cf6de3bc0fefd5de5cefbcfffb8b7c1 | |
parent | 54be27caf1ec50c0b76409b009d3dbcb894f0aca (diff) | |
parent | bfacfb1f9c84a812e3a79befbd96f9570f9072aa (diff) |
Merge "Update test_vnf.py to support py3"
-rw-r--r-- | functest/tests/unit/core/test_vnf.py | 4 | ||||
-rw-r--r-- | 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' @@ -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} |