Merge "Update test_vnf.py to support py3"

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 e322773e..ce859040 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 efaa8d6b..bde3a975 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}