From 3575dcb2a262c623dd4ded0823bc78adf3a1012e Mon Sep 17 00:00:00 2001 From: boucherv Date: Mon, 20 Mar 2017 10:52:48 +0100 Subject: [vnf_base] improve exception Return on part of previous changes in commit: 30257 https://gerrit.opnfv.org/gerrit/#/c/30257/ Change-Id: I11b33ee2a6f9d4cbcf1449006b47be508fce655e Signed-off-by: boucherv --- functest/tests/unit/core/test_vnf_base.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'functest/tests/unit') diff --git a/functest/tests/unit/core/test_vnf_base.py b/functest/tests/unit/core/test_vnf_base.py index 25a74b7c..1680f03f 100644 --- a/functest/tests/unit/core/test_vnf_base.py +++ b/functest/tests/unit/core/test_vnf_base.py @@ -8,11 +8,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 import logging -import mock import unittest from functest.core import vnf_base -from functest.core import testcase_base class VnfBaseTesting(unittest.TestCase): @@ -37,17 +35,15 @@ class VnfBaseTesting(unittest.TestCase): "result": "", "duration": 5}} - @mock.patch('logging.Logger.error') - def test_deploy_vnf_unimplemented(self, mock): - self.assertEqual(self.test.deploy_vnf(), - testcase_base.TestcaseBase.EX_TESTCASE_FAILED) - mock.assert_called_with('VNF must be deployed') - - @mock.patch('logging.Logger.error') - def test_test_vnf_unimplemented(self, mock): - self.assertEqual(self.test.test_vnf(), - testcase_base.TestcaseBase.EX_TESTCASE_FAILED) - mock.assert_called_with('VNF must be tested') + def test_deploy_vnf_unimplemented(self): + with self.assertRaises(Exception) as context: + self.test.deploy_vnf() + self.assertTrue('VNF not deployed' in 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) def test_parse_results(self): self.assertNotEqual(self.test.parse_results(), 0) -- cgit 1.2.3-korg