TST: Makes the tests work with python 3.

Author: llllllllll

qdb/tracer.py

@@ -23,7 +23,7 @@
 from logbook import Logger, FileHandler
 
 from qdb.comm import RemoteCommandManager, fmt_msg
-from qdb.compat import map, items
+from qdb.compat import map, items, ExitStack
 from qdb.config import QdbConfig
 from qdb.errors import QdbUnreachableBreakpoint, QdbQuit, QdbExecutionTimeout
 from qdb.output import RemoteOutput, OutputTee

setup.py

@@ -67,7 +67,6 @@
         'Topic :: Software Development :: Debuggers',
     ],
     install_requires=[
-        'contextlib2',
         'Logbook',
         'websocket-client',
     ] + py2_requires,

tests/__init__.py

@@ -12,11 +12,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
+from qdb.compat import gevent
+if gevent is not None:
     from gevent.monkey import patch_all
-except ImportError:
-    pass
-else:
     patch_all()  # Patch out the modules before executing the tests.
 
 import os

tests/compat.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 from unittest import skipIf
-from qdb.compat import PY3
+from qdb.compat import PY3, items
 
 try:
     from unittest import mock
@@ -28,8 +28,19 @@ def __init__(self, value):
 skip_py3 = skipIf(PY3, 'This test will not work with python3')
 
 
+class Py2TestMeta(type):
+    def __new__(mcls, name, bases, dict_):
+        return type.__new__(
+            mcls,
+            name,
+            bases,
+            {k: skip_py3(v) for k, v in items(dict_) if k.startswith('test_')},
+        )
+
+
 __all__ = [
     'NonLocal',
+    'Py2TestMeta',
     'mock',
     'skip_py3',
 ]

tests/test_cmd_manager.py

@@ -23,7 +23,7 @@
 
 from qdb import Qdb
 from qdb.comm import RemoteCommandManager, ServerLocalCommandManager, fmt_msg
-from qdb.compat import PY2, gevent
+from qdb.compat import with_metaclass, PY2, gevent
 from qdb.errors import (
     QdbFailedToConnect,
     QdbAuthenticationError,
@@ -40,6 +40,9 @@
 patch = mock.patch
 MagicMock = mock.MagicMock
 
+patch = mock.patch
+MagicMock = mock.MagicMock
+
 
 def set_break_params(tracer, filename, lineno, temporary=False, cond=None,
                      funcname=None, **kwargs):
@@ -56,7 +59,7 @@ def set_break_params(tracer, filename, lineno, temporary=False, cond=None,
     }
 
 
-class RemoteCommandManagerTester(TestCase):
+class RemoteCommandManagerTester(with_metaclass(Py2TestMeta, TestCase)):
     """
     Tests the various behaviors that the RemoteCommandManager should conform
     to. Some tests rely on how the command manager affects the tracer that it

tests/test_server.py

@@ -19,9 +19,7 @@
 from struct import pack
 
 from qdb.comm import fmt_msg, fmt_err_msg, get_events_from_socket
-from qdb.compat import gevent, PY2
-
-from tests.compat import skip_py3
+from qdb.compat import gevent, with_metaclass, PY2
 
 if PY2:
     # These need python 2
@@ -34,6 +32,8 @@
     from qdb.server.session_store import ALLOW_ORPHANS
     from qdb.server.client import DEFAULT_ROUTE_FMT
 
+from tests.compat import Py2TestMeta
+
 
 def send_tracer_event(sck, event, payload):
     """
@@ -68,8 +68,7 @@ def recv_client_event(ws):
     return json.loads(ws.recv())
 
 
-@skip_py3
-class ServerTester(TestCase):
+class ServerTester(with_metaclass(Py2TestMeta, TestCase)):
     def test_start_stop(self):
         """
         Tests starting and stopping the server.

tests/utils.py

@@ -17,12 +17,11 @@
 from time import sleep
 
 from qdb.comm import CommandManager, NopCommandManager
-from qdb.compat import PY3
+from qdb.compat import gevent, PY3
 
-if PY3:
+
+if gevent is None:
     from queue import Queue, Empty
-else:
-    from Queue import Queue, Empty
 
 
 class QueueCommandManager(CommandManager):
@@ -45,7 +44,7 @@ def user_wait(self, duration):
         """
         Simulates waiting on the user to feed us input for duration seconds.
         """
-        self.enqueue(lambda t: sleep(duration + 1))
+        self.enqueue(lambda t: sleep(duration + int(PY3)))
 
     def clear(self):
         """