summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-06-01 17:49:49 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-06-01 17:49:49 -0700
commite0d2dde5d370d76cd8ff55e47dbbf749be43a4c9 (patch)
tree9088f430aa5946c47273aceb3dc00d2b91760a26 /nova/tests
parentcf464dc7f2093ea3d1f831915ce22f54f0d1c90a (diff)
downloadnova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.tar.gz
nova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.tar.xz
nova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.zip
tests all passing again
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_scheduler.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 54b3f80fb..5d8f34efd 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -1109,10 +1109,4 @@ class CallZoneMethodTest(test.TestCase):
def test_call_zone_method_generates_exception(self):
context = {}
method = 'raises_exception'
- results = api.call_zone_method(context, method)
-
- # FIXME(sirp): for now the _error_trap code is catching errors and
- # converting them to a ("ERROR", "string") tuples. The code (and this
- # test) should eventually handle real exceptions.
- expected = [(1, ('ERROR', 'testing'))]
- self.assertEqual(expected, results)
+ self.assertRaises(Exception, api.call_zone_method, context, method)