diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-20 14:52:49 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-20 14:52:49 -0400 |
| commit | 5cd8cd6e71dd8fdc66a31f12e8a5248e81529e38 (patch) | |
| tree | 47f467fcc83a2f158f48d52e1c8854a2f1e72448 | |
| parent | f200587ce068482ab94e777154de3ac777269fa0 (diff) | |
| parent | ae760b13c5382f2f4719dde445235c156cc27d18 (diff) | |
| download | nova-5cd8cd6e71dd8fdc66a31f12e8a5248e81529e38.tar.gz nova-5cd8cd6e71dd8fdc66a31f12e8a5248e81529e38.tar.xz nova-5cd8cd6e71dd8fdc66a31f12e8a5248e81529e38.zip | |
Merge from other branch where I accidentally applied this
| -rw-r--r-- | nova/api/rackspace/ratelimiting/tests.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nova/api/rackspace/ratelimiting/tests.py b/nova/api/rackspace/ratelimiting/tests.py index 13a47989b..4c9510917 100644 --- a/nova/api/rackspace/ratelimiting/tests.py +++ b/nova/api/rackspace/ratelimiting/tests.py @@ -227,13 +227,10 @@ class WSGIAppProxyTest(unittest.TestCase): self.assertEqual(when, 1.5) def test_failure(self): - self.limiter.mock('murder', 'brutus', None) - try: - when = self.proxy.perform('stab', 'brutus') - except AssertionError: - pass - else: - self.fail("I didn't perform the action I expected") + def shouldRaise(): + self.limiter.mock('murder', 'brutus', None) + self.proxy.perform('stab', 'brutus') + self.assertRaises(AssertionError, shouldRaise) if __name__ == '__main__': |