Re-enable the other tests, even though these still fail for me (b.f.o #43303).

Fix another except syntax problem.

2 files changed, 9 insertions, 9 deletions

diff --git a/test/run-test.sh b/test/run-test.sh
index 2530b3f..e50dae5 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -112,13 +112,13 @@ else
   echo "  - cross-test server reported no untested functions"
 fi
 
-# echo "running test-client.py"
-# $PYTHON "$DBUS_TOP_SRCDIR"/test/test-client.py || die "test-client.py failed"
-# echo "running test-signals.py"
-# $PYTHON "$DBUS_TOP_SRCDIR"/test/test-signals.py || die "test-signals.py failed"
+echo "running test-client.py"
+$PYTHON "$DBUS_TOP_SRCDIR"/test/test-client.py || die "test-client.py failed"
+echo "running test-signals.py"
+$PYTHON "$DBUS_TOP_SRCDIR"/test/test-signals.py || die "test-signals.py failed"
 
-# echo "running test-p2p.py"
-# $PYTHON "$DBUS_TOP_SRCDIR"/test/test-p2p.py || die "... failed"
+echo "running test-p2p.py"
+$PYTHON "$DBUS_TOP_SRCDIR"/test/test-p2p.py || die "... failed"
 
 rm -f "$DBUS_TOP_BUILDDIR"/test/test-service.log
 rm -f "$DBUS_TOP_BUILDDIR"/test/cross-client.log
diff --git a/test/test-client.py b/test/test-client.py
index 30b150c..d8dc387 100755
--- a/test/test-client.py
+++ b/test/test-client.py
@@ -265,7 +265,7 @@ class TestDBusBindings(unittest.TestCase):
             for value in range(len(values)):
                 try:
                     ret = method(value)
-                except Exception, e:
+                except Exception as e:
                     print("%s(%r) raised %s: %s" % (method._method_name, values[value], e.__class__, e))
 
                     # should fail if it tried to marshal the wrong type
@@ -284,7 +284,7 @@ class TestDBusBindings(unittest.TestCase):
             for value in range(len(values)):
                 try:
                     self.iface.EmitSignal(signal, value)
-                except Exception, e:
+                except Exception as e:
                     print("EmitSignal(%s, %r) raised %s" % (signal, values[value], e.__class__))
 
                     # should fail if it tried to marshal the wrong type
@@ -313,7 +313,7 @@ class TestDBusBindings(unittest.TestCase):
                     val = ('a', 1, False, [1,2], {1:2})
                     print("calling AsynchronousMethod with %s %s %s" % (async, fail, val))
                     ret = self.iface.AsynchronousMethod(async, fail, val)
-                except Exception, e:
+                except Exception as e:
                     self.assert_(fail, '%s: %s' % (e.__class__, e))
                     print("Expected failure: %s: %s" % (e.__class__, e))
                 else: