Fix brokenness, copy-paste errors and unused variables in tests

I thought I'd tested this... but apparently not.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Xavier Claessens <xclaesse@gmail.com>

11 files changed, 3 insertions, 16 deletions

diff --git a/tests/dbus/call-example.c b/tests/dbus/call-example.c
index dd84c11a2..84075d447 100644
--- a/tests/dbus/call-example.c
+++ b/tests/dbus/call-example.c
@@ -1044,7 +1044,7 @@ static void
 teardown (Test *test,
           gconstpointer data G_GNUC_UNUSED)
 {
-  tp_tests_connection_assert_disconnect_succeeds (test->connection);
+  tp_tests_connection_assert_disconnect_succeeds (test->conn);
 
   if (test->members_changed_detailed_id != 0)
     {
diff --git a/tests/dbus/connection-aliasing.c b/tests/dbus/connection-aliasing.c
index ae10f9f08..7501d41ac 100644
--- a/tests/dbus/connection-aliasing.c
+++ b/tests/dbus/connection-aliasing.c
@@ -99,7 +99,6 @@ teardown (Test *test,
     gconstpointer data G_GNUC_UNUSED)
 {
   TpConnection *conn;
-  gboolean ok;
   GError *error = NULL;
 
   g_clear_error (&test->error);
diff --git a/tests/dbus/connection-balance.c b/tests/dbus/connection-balance.c
index b462a3ff8..82dde11dd 100644
--- a/tests/dbus/connection-balance.c
+++ b/tests/dbus/connection-balance.c
@@ -245,7 +245,6 @@ teardown (Test *test,
     gconstpointer data G_GNUC_UNUSED)
 {
   TpConnection *conn;
-  gboolean ok;
   GError *error = NULL;
 
   g_clear_error (&test->error);
diff --git a/tests/dbus/connection-error.c b/tests/dbus/connection-error.c
index 5bc3b3380..66763226e 100644
--- a/tests/dbus/connection-error.c
+++ b/tests/dbus/connection-error.c
@@ -161,7 +161,7 @@ teardown (Test *test,
 {
   GAsyncResult *result = NULL;
 
-  tp_connection_disconnect_async (connection, tp_tests_result_ready_cb,
+  tp_connection_disconnect_async (test->conn, tp_tests_result_ready_cb,
       &result);
   tp_tests_run_until_result (&result);
   /* Ignore success/failure: it might already have gone */
diff --git a/tests/dbus/connection-interests.c b/tests/dbus/connection-interests.c
index 2cbb6be35..bf0138abc 100644
--- a/tests/dbus/connection-interests.c
+++ b/tests/dbus/connection-interests.c
@@ -219,7 +219,6 @@ teardown (Test *test,
     gconstpointer data)
 {
   TpConnection *conn;
-  gboolean ok;
   GError *error = NULL;
 
   if (test->conn != NULL)
diff --git a/tests/dbus/connection.c b/tests/dbus/connection.c
index 89fff10d8..427e6ca5a 100644
--- a/tests/dbus/connection.c
+++ b/tests/dbus/connection.c
@@ -82,7 +82,6 @@ teardown (Test *test,
     gconstpointer data)
 {
   TpConnection *conn;
-  gboolean ok;
   GError *error = NULL;
 
   if (test->conn != NULL)
diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c
index 6330935cb..f01bf11e8 100644
--- a/tests/dbus/contact-lists.c
+++ b/tests/dbus/contact-lists.c
@@ -448,7 +448,6 @@ teardown (Test *test,
     gconstpointer data)
 {
   TpConnection *conn;
-  gboolean ok;
   GError *error = NULL;
 
   g_array_unref (test->arr);
diff --git a/tests/dbus/contacts-slow-path.c b/tests/dbus/contacts-slow-path.c
index c5ab44a0e..1f60082f1 100644
--- a/tests/dbus/contacts-slow-path.c
+++ b/tests/dbus/contacts-slow-path.c
@@ -1217,9 +1217,6 @@ static void
 teardown (Fixture *f,
     gconstpointer unused G_GNUC_UNUSED)
 {
-  GError *error = NULL;
-  gboolean ok;
-
   if (f->legacy_client_conn != NULL)
     tp_tests_connection_assert_disconnect_succeeds (f->legacy_client_conn);
 
diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c
index b4b5af91c..75802f016 100644
--- a/tests/dbus/contacts.c
+++ b/tests/dbus/contacts.c
@@ -2882,9 +2882,6 @@ static void
 teardown (Fixture *f,
     gconstpointer unused G_GNUC_UNUSED)
 {
-  gboolean ok;
-  GError *error = NULL;
-
   if (f->client_conn != NULL)
     tp_tests_connection_assert_disconnect_succeeds (f->client_conn);
 
diff --git a/tests/dbus/self-handle.c b/tests/dbus/self-handle.c
index 703d8cb79..efc9367a3 100644
--- a/tests/dbus/self-handle.c
+++ b/tests/dbus/self-handle.c
@@ -325,8 +325,6 @@ static void
 teardown (Fixture *f,
     gconstpointer unused G_GNUC_UNUSED)
 {
-  gboolean ok;
-
   g_clear_error (&f->error);
 
   if (f->client_conn != NULL)
diff --git a/tests/lib/util.c b/tests/lib/util.c
index 978b199c7..f758b4f33 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -466,7 +466,7 @@ tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection)
   tp_connection_disconnect_async (connection, tp_tests_result_ready_cb,
       &result);
   tp_tests_run_until_result (&result);
-  ok = tp_connection_disconnect_finish (connection, result, error);
+  ok = tp_connection_disconnect_finish (connection, result, &error);
   g_assert_no_error (error);
   g_assert (ok);
   g_object_unref (result);