diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-04 15:54:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-04 15:54:19 +0000 |
| commit | 96f610516fb147c33380e4845ccfbf77cb351aed (patch) | |
| tree | 1977f4d2bee545e1b7a64b654077afd0e026074e /nova/tests | |
| parent | 1d4506c16aec9674be6a3685ba585a8bbd9c1559 (diff) | |
| parent | 10d503b27b8e5abbd8802b3107acd35024761558 (diff) | |
Merge "ip_protocol for ec2 security groups"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_api.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_exception.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index 4a4260705..d2710777b 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -448,7 +448,7 @@ class ApiEc2TestCase(test.TestCase): # Invalid Cidr for ICMP type _assert('Invalid CIDR', 'icmp', -1, -1, '0.0.444.0/4') # Invalid protocol - _assert('An unknown error has occurred', 'xyz', 1, 14, '0.0.0.0/0') + _assert('Invalid IP protocol', 'xyz', 1, 14, '0.0.0.0/0') # Invalid port _assert('An unknown error has occurred', 'tcp', " ", "81", '0.0.0.0/0') # Invalid icmp port diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py index 0db8067a2..f7e4bc037 100644 --- a/nova/tests/test_exception.py +++ b/nova/tests/test_exception.py @@ -30,7 +30,6 @@ class EC2APIErrorTestCase(test.TestCase): self.assertEqual(err.msg, 'fake error') # with 'code' arg err = exception.EC2APIError('fake error', 'blah code') - self.assertEqual(err.__str__(), 'blah code: fake error') self.assertEqual(err.code, 'blah code') self.assertEqual(err.msg, 'fake error') |