Merge "Fixes a test failure in master"

2011-09-28 20:51:38 +00:00
parent c70cd081f4 2d0287da8d
commit ba3a6f80fe
1 changed files with 4 additions and 4 deletions
--- a/nova/tests/test_signer.py
+++ b/nova/tests/test_signer.py
@@ -86,7 +86,7 @@ class SignerTestCase(test.TestCase):
                              'GET', 'server', '/foo'))

    def test_generate_unknown_version(self):
-        with self.assertRaises(exception.Error):
-            self.signer.generate({'SignatureMethod': 'HmacSHA256',
-                                  'SignatureVersion': '9'},
-                                 'GET', 'server', '/foo')
+        self.assertRaises(exception.Error,
+                self.signer.generate,
+                {'SignatureMethod': 'HmacSHA256', 'SignatureVersion': '9'},
+                'GET', 'server', '/foo')