summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-11-24 14:54:14 +0100
committerVictor Stinner <victor.stinner@gmail.com>2014-11-24 14:54:14 +0100
commitd443ac2f43311099e3627a722438f5721d1b29b4 (patch)
treeafee5e54df82e83dcdb9a1733b288c90362fb09a
parent0058f772bc161d5fcc475a6fcc5008a578126d91 (diff)
downloadaioeventlet-d443ac2f43311099e3627a722438f5721d1b29b4.tar.gz
tests: check also the exception message
-rw-r--r--tests/test_eventlet.py13
-rw-r--r--tests/test_greenlet.py6
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/test_eventlet.py b/tests/test_eventlet.py
index ac46e1f..9a83008 100644
--- a/tests/test_eventlet.py
+++ b/tests/test_eventlet.py
@@ -291,7 +291,8 @@ class WrapGreenthreadTests(tests.TestCase):
self.loop.set_debug(False)
gt = eventlet.spawn(func)
- self.assertRaises(RuntimeError, gt.wait)
+ msg = "wrap_greenthread: the greenthread is running"
+ self.assertRaisesRegexp(RuntimeError, msg, gt.wait)
def test_wrap_greenthread_dead(self):
def func():
@@ -301,7 +302,9 @@ class WrapGreenthreadTests(tests.TestCase):
result = gt.wait()
self.assertEqual(result, 'ok')
- self.assertRaises(RuntimeError, aiogreen.wrap_greenthread, gt)
+ msg = "wrap_greenthread: the greenthread already finished"
+ self.assertRaisesRegexp(RuntimeError, msg,
+ aiogreen.wrap_greenthread, gt)
def test_coro_wrap_greenthread(self):
result = self.loop.run_until_complete(coro_wrap_greenthread())
@@ -354,7 +357,8 @@ class WrapGreenletTests(tests.TestCase):
event.send(fut)
gt = eventlet.spawn_n(func)
- self.assertRaises(RuntimeError, event.wait)
+ msg = "wrap_greenthread: the greenthread is running"
+ self.assertRaisesRegexp(RuntimeError, msg, event.wait)
def test_wrap_greenlet_dead(self):
event = eventlet.event.Event()
@@ -363,7 +367,8 @@ class WrapGreenletTests(tests.TestCase):
gt = eventlet.spawn_n(func)
event.wait()
- self.assertRaises(RuntimeError, aiogreen.wrap_greenthread, gt)
+ msg = "wrap_greenthread: the greenthread already finished"
+ self.assertRaisesRegexp(RuntimeError, msg, aiogreen.wrap_greenthread, gt)
if __name__ == '__main__':
diff --git a/tests/test_greenlet.py b/tests/test_greenlet.py
index 8ee8a06..f411a8e 100644
--- a/tests/test_greenlet.py
+++ b/tests/test_greenlet.py
@@ -35,7 +35,8 @@ class WrapGreenletTests(tests.TestCase):
return aiogreen.wrap_greenthread(gl)
gl = greenlet.greenlet(func)
- self.assertRaises(RuntimeError, gl.switch, 5)
+ msg = "wrap_greenthread: the greenthread is running"
+ self.assertRaisesRegexp(RuntimeError, msg, gl.switch, 5)
def test_wrap_greenlet_dead(self):
def func(value):
@@ -43,7 +44,8 @@ class WrapGreenletTests(tests.TestCase):
gl = greenlet.greenlet(func)
gl.switch(5)
- self.assertRaises(RuntimeError, aiogreen.wrap_greenthread, gl)
+ msg = "wrap_greenthread: the greenthread already finished"
+ self.assertRaisesRegexp(RuntimeError, msg, aiogreen.wrap_greenthread, gl)
if __name__ == '__main__':