TornadoEventLoop: use new shared event loop tests

2 files changed, 12 insertions, 91 deletions

diff --git a/urwid/main_loop.py b/urwid/main_loop.py
index f209c51..11ef66e 100755
--- a/urwid/main_loop.py
+++ b/urwid/main_loop.py
@@ -967,97 +967,6 @@ class TornadoEventLoop(object):
             exc, self._exception = self._exception, None
             raise exc
 
-    def _test_event_loop(self):
-        """
-        >>> import os
-        >>> from tornado.ioloop import IOLoop
-        >>> rd, wr = os.pipe()
-        >>> evl = TornadoEventLoop(IOLoop())
-        >>> def step1():
-        ...     print("writing")
-        ...     os.write(wr, b"hi")
-        >>> def step2():
-        ...     print(os.read(rd, 2).decode())
-        ...     raise ExitMainLoop
-        >>> handle = evl.alarm(0, step1)
-        >>> handle = evl.watch_file(rd, step2)
-        >>> evl.run()
-        writing
-        hi
-        """
-
-    def _test_remove_alarm(self):
-        """
-        >>> from tornado.ioloop import IOLoop
-        >>> evl = TornadoEventLoop(IOLoop())
-        >>> handle = evl.alarm(50, lambda: None)
-        >>> evl.remove_alarm(handle)
-        True
-        >>> evl.remove_alarm(handle)  # always True
-        True
-        """
-
-    def _test_remove_watch_file(self):
-        """
-        >>> from tornado.ioloop import IOLoop
-        >>> evl = TornadoEventLoop(IOLoop())
-        >>> handle = evl.watch_file(1, lambda: None)
-        >>> evl.remove_watch_file(handle)
-        True
-        >>> evl.remove_watch_file(handle)
-        False
-        """
-
-    def _test_run(self):
-        """
-        >>> import os
-        >>> from tornado.ioloop import IOLoop
-        >>> rd, wr = os.pipe()
-        >>> os.write(wr, b"data") # something to read from rd
-        4
-
-        >>> evl = TornadoEventLoop(IOLoop())
-        >>> def say_hello():
-        ...     print("hello")
-        >>> def say_waiting():
-        ...     print("waiting")
-        >>> def exit_clean():
-        ...     print("clean exit")
-        ...     raise ExitMainLoop
-        >>> def exit_error():
-        ...     1//0
-        >>> handle = evl.alarm(0.1,  exit_clean)
-        >>> handle = evl.alarm(0.05, say_hello)
-        >>> evl.enter_idle(say_waiting)
-        1
-
-        >>> evl.run()
-        waiting
-        hello
-        waiting
-        clean exit
-
-        >>> handle = evl.watch_file(rd, exit_clean)
-        >>> evl.run()
-        waiting
-        clean exit
-
-        >>> evl.remove_watch_file(handle)
-        True
-
-        >>> handle = evl.alarm(0, exit_error)
-        >>> evl.run()
-        Traceback (most recent call last):
-           ...
-        ZeroDivisionError: integer division or modulo by zero
-        >>> handle = evl.watch_file(rd, exit_error)
-        >>> evl.run()
-        Traceback (most recent call last):
-           ...
-        ZeroDivisionError: integer division or modulo by zero
-        """
-
-
 
 try:
     from twisted.internet.abstract import FileDescriptor
diff --git a/urwid/tests/test_event_loops.py b/urwid/tests/test_event_loops.py
index 38de225..9f271f0 100644
--- a/urwid/tests/test_event_loops.py
+++ b/urwid/tests/test_event_loops.py
@@ -78,6 +78,18 @@ else:
         def setUp(self):
             self.evl = urwid.GLibEventLoop()
 
+
+try:
+    import tornado
+except ImportError:
+    pass
+else:
+    class TornadoEventLoopTest(unittest.TestCase, EventLoopTestMixin):
+        def setUp(self):
+            from tornado.ioloop import IOLoop
+            self.evl = urwid.TornadoEventLoop(IOLoop())
+
+
 try:
     import twisted
 except ImportError: