Fixed saranwrap tests which have appear to have always been broken. Removed support for raising string exceptions, because who does that anymore, and it was getting annoying to see the warning every time.

This commit is contained in:
Ryan Williams
2009-08-23 18:42:02 -07:00
parent 620aaa9108
commit 888eec7a3c
2 changed files with 2 additions and 18 deletions

View File

@@ -565,8 +565,6 @@ when the id is None."""
raise e
except Exception, e:
self.write_exception(e)
except:
self.write_exception(sys.exc_info()[0])
def is_value(self, value):
"""\
@@ -596,10 +594,6 @@ when the id is None."""
self.respond(['exception', e])
# test function used for testing that final except clause
def raise_a_weird_error():
raise "oh noes you can raise a string"
# test function used for testing return of unpicklable exceptions
def raise_an_unpicklable_error():
class Unpicklable(Exception):

View File

@@ -22,6 +22,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
from tests import skipped
from eventlet import api, saranwrap
from eventlet.pool import Pool
@@ -150,18 +151,7 @@ class TestSaranwrap(unittest.TestCase):
prox.never_name_a_function_like_this()
self.assertRaises(AttributeError, nofunc)
def test_raising_weird_exceptions(self):
# the recursion is killing me!
prox = saranwrap.wrap(saranwrap)
try:
prox.raise_a_weird_error()
self.assert_(False)
except:
import sys
ex = sys.exc_info()[0]
self.assertEqual(ex, "oh noes you can raise a string")
self.assert_server_exists(prox)
@skipped
def test_unpicklable_server_exception(self):
prox = saranwrap.wrap(saranwrap)
def unpickle():