Add support for testing without tappy

The latest version of tappy dropped Python 2 support, but I want to be
able to continue to run dbus-python tests on Python 2 for now.

Signed-off-by: Simon McVittie <smcv@collabora.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/test/test-client.py b/test/test-client.py
index f028ced..bc6a900 100755
--- a/test/test-client.py
+++ b/test/test-client.py
@@ -32,17 +32,12 @@ import time
 import logging
 import weakref
 
-try:
-    from tap.runner import TAPTestRunner
-except ImportError:
-    print('1..0 # SKIP cannot import TAPTestRunner')
-    raise SystemExit(0)
-
 import dbus
 import _dbus_bindings
 import dbus.glib
 import dbus.lowlevel
 import dbus.service
+import dbus_test_utils
 
 from dbus._compat import is_py2, is_py3
 
@@ -693,6 +688,4 @@ if __name__ == '__main__':
     gobject.threads_init()
     dbus.glib.init_threads()
 
-    runner = TAPTestRunner()
-    runner.set_stream(True)
-    unittest.main(testRunner=runner)
+    dbus_test_utils.main()