From e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Wed, 1 Jun 2011 17:49:49 -0700
Subject: tests all passing again

---
 nova/tests/test_scheduler.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'nova/tests')

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)
-- 
cgit