diff options
Diffstat (limited to 'heat/tests/neutron/test_neutron_vpnservice.py')
| -rw-r--r-- | heat/tests/neutron/test_neutron_vpnservice.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/heat/tests/neutron/test_neutron_vpnservice.py b/heat/tests/neutron/test_neutron_vpnservice.py index 8b15feea4..fc6098afd 100644 --- a/heat/tests/neutron/test_neutron_vpnservice.py +++ b/heat/tests/neutron/test_neutron_vpnservice.py @@ -194,7 +194,8 @@ class VPNServiceTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.create)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.vpnservice: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -229,7 +230,8 @@ class VPNServiceTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.delete)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.vpnservice: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -340,7 +342,8 @@ class IPsecSiteConnectionTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.create)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ipsec_site_connection: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -375,7 +378,8 @@ class IPsecSiteConnectionTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.delete)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ipsec_site_connection: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -485,7 +489,8 @@ class IKEPolicyTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.create)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ikepolicy: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -520,7 +525,8 @@ class IKEPolicyTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.delete)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ikepolicy: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -625,7 +631,8 @@ class IPsecPolicyTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.create)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ipsecpolicy: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() @@ -660,7 +667,8 @@ class IPsecPolicyTest(common.HeatTestCase): error = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(rsrc.delete)) self.assertEqual( - 'NeutronClientException: An unknown exception occurred.', + 'NeutronClientException: resources.ipsecpolicy: ' + 'An unknown exception occurred.', six.text_type(error)) self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state) self.m.VerifyAll() |