diff options
author | Alexander Akulich <akulichalexander@gmail.com> | 2021-01-26 18:23:28 +0300 |
---|---|---|
committer | Alexander Akulich <akulichalexander@gmail.com> | 2021-01-26 18:23:28 +0300 |
commit | c5c0ed20267d530da5f8084d4fac664d95f31111 (patch) | |
tree | 5ca44db1e8a71058ceacfff7869c740c905cae6c /tests | |
parent | 2ec2564642ca3c3e84cc7fc0c29c5da2567201dd (diff) | |
parent | 9c6c6fb5203d8cb73064a02cc6b147aa91908952 (diff) | |
download | telepathy-glib-c5c0ed20267d530da5f8084d4fac664d95f31111.tar.gz |
Merge 'master' into telepathy-glib-0.24 (the branch has only fixes)
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/all-errors-documented.py | 2 | ||||
-rw-r--r-- | tests/dbus/Makefile.am | 2 | ||||
-rw-r--r-- | tests/dbus/account.c | 8 | ||||
-rw-r--r-- | tests/dbus/cm.c | 2 | ||||
-rw-r--r-- | tests/dbus/contact-list-client.c | 4 | ||||
-rw-r--r-- | tests/dbus/contact-lists.c | 2 | ||||
-rw-r--r-- | tests/tools/expected-gtypes-body.h | 24 | ||||
-rw-r--r-- | tests/tools/expected-gtypes.h | 10 |
8 files changed, 27 insertions, 27 deletions
diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py index ae66df55f..ad7d52d11 100755 --- a/tests/all-errors-documented.py +++ b/tests/all-errors-documented.py @@ -24,7 +24,7 @@ def check_all_errors_documented(abs_top_srcdir): error.getAttribute('name').replace('.', '_').replace(' ', '_').upper()) if '%s\n' % name not in sections: - print "'%s' is missing in %s" % (name, sections_path) + print("'%s' is missing in %s" % (name, sections_path)) sys.exit(1) if __name__ == '__main__': diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index 71f974c82..8cd47ca03 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -342,7 +342,7 @@ run-test.sh: run-test.sh.in $< > $@ @chmod +x $@ -service_files = services/dbus-1/spurious.service +service_files = dbus-1/services/spurious.service if ENABLE_INSTALLED_TESTS dbusservicedir = @tpglibtestsdir@/dbus-1/services diff --git a/tests/dbus/account.c b/tests/dbus/account.c index 1df043ab5..c10497869 100644 --- a/tests/dbus/account.c +++ b/tests/dbus/account.c @@ -980,7 +980,7 @@ main (int argc, g_test_add ("/account/reconnect", Test, NULL, setup_service, test_reconnect, teardown_service); - g_test_add ("/account/reconnect", Test, "vardict", setup_service, + g_test_add ("/account/reconnect/vardict", Test, "vardict", setup_service, test_reconnect, teardown_service); g_test_add ("/account/prepare/success", Test, NULL, setup_service, @@ -991,15 +991,15 @@ main (int argc, g_test_add ("/account/storage", Test, "first", setup_service, test_storage, teardown_service); - g_test_add ("/account/storage", Test, "later", setup_service, test_storage, - teardown_service); + g_test_add ("/account/storage/later", Test, "later", setup_service, + test_storage, teardown_service); g_test_add ("/account/avatar", Test, NULL, setup_service, test_avatar, teardown_service); g_test_add ("/account/addressing", Test, "first", setup_service, test_addressing, teardown_service); - g_test_add ("/account/addressing", Test, "later", setup_service, + g_test_add ("/account/addressing/later", Test, "later", setup_service, test_addressing, teardown_service); return tp_tests_run_with_bus (); diff --git a/tests/dbus/cm.c b/tests/dbus/cm.c index ad4285475..e0f18eaa5 100644 --- a/tests/dbus/cm.c +++ b/tests/dbus/cm.c @@ -1187,7 +1187,7 @@ main (int argc, g_test_add ("/cm/list", Test, GINT_TO_POINTER (0), setup, test_list, teardown); - g_test_add ("/cm/list", Test, GINT_TO_POINTER (USE_OLD_LIST), + g_test_add ("/cm/list/old", Test, GINT_TO_POINTER (USE_OLD_LIST), setup, test_list, teardown); return tp_tests_run_with_bus (); diff --git a/tests/dbus/contact-list-client.c b/tests/dbus/contact-list-client.c index a3f878a16..99c7a875c 100644 --- a/tests/dbus/contact-list-client.c +++ b/tests/dbus/contact-list-client.c @@ -505,7 +505,7 @@ test_is_blocked (Test *test, static void test_contact_list_properties (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { gboolean props_only = GPOINTER_TO_UINT (data); GQuark conn_features[] = { 0, 0 }; @@ -577,7 +577,7 @@ main (int argc, g_test_add ("/contact-list-client/contact-list/properties", Test, GUINT_TO_POINTER (FALSE), setup, test_contact_list_properties, teardown); - g_test_add ("/contact-list-client/contact-list/properties", Test, + g_test_add ("/contact-list-client/contact-list/properties/props-only", Test, GUINT_TO_POINTER (TRUE), setup, test_contact_list_properties, teardown); return tp_tests_run_with_bus (); diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c index 43ab26280..5e88a1829 100644 --- a/tests/dbus/contact-lists.c +++ b/tests/dbus/contact-lists.c @@ -2788,7 +2788,7 @@ main (int argc, g_test_add ("/contact-lists/cancelled-publish-request", Test, NULL, setup, test_cancelled_publish_request, teardown); - g_test_add ("/contact-lists/cancelled-publish-request", + g_test_add ("/contact-lists/cancelled-publish-request/remove-after", Test, "remove-after", setup, test_cancelled_publish_request, teardown); g_test_add ("/contact-lists/add-to-stored", diff --git a/tests/tools/expected-gtypes-body.h b/tests/tools/expected-gtypes-body.h index ab1d7e99a..e575c818e 100644 --- a/tests/tools/expected-gtypes-body.h +++ b/tests/tools/expected-gtypes-body.h @@ -5,12 +5,12 @@ */ GType -the_prefix_type_dbus_hash_ss (void) +the_prefix_type_dbus_hash_saa_7bsv_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))))); return t; } @@ -25,22 +25,22 @@ the_prefix_type_dbus_hash_sa_7bsv_7d (void) } GType -the_prefix_type_dbus_hash_sv (void) +the_prefix_type_dbus_hash_ss (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); return t; } GType -the_prefix_type_dbus_hash_saa_7bsv_7d (void) +the_prefix_type_dbus_hash_sv (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))))); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); return t; } @@ -69,32 +69,32 @@ the_prefix_type_dbus_array_isu (void) } GType -the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void) +the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ()); return t; } GType -the_prefix_type_dbus_array_of_a_7bsv_7d (void) +the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ()); return t; } GType -the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void) +the_prefix_type_dbus_array_of_a_7bsv_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ()); return t; } diff --git a/tests/tools/expected-gtypes.h b/tests/tools/expected-gtypes.h index 2fc94e261..5164cab18 100644 --- a/tests/tools/expected-gtypes.h +++ b/tests/tools/expected-gtypes.h @@ -18,13 +18,13 @@ #define THE_PREFIX_ARRAY_TYPE_STRING_VARIANT_MAP_LIST_MAP_LIST (the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d ()) -GType the_prefix_type_dbus_hash_ss (void); +GType the_prefix_type_dbus_hash_saa_7bsv_7d (void); GType the_prefix_type_dbus_hash_sa_7bsv_7d (void); -GType the_prefix_type_dbus_hash_sv (void); +GType the_prefix_type_dbus_hash_ss (void); -GType the_prefix_type_dbus_hash_saa_7bsv_7d (void); +GType the_prefix_type_dbus_hash_sv (void); #define THE_PREFIX_STRUCT_TYPE_STRUCT (the_prefix_type_dbus_struct_isu ()) @@ -34,9 +34,9 @@ GType the_prefix_type_dbus_struct_isu (void); GType the_prefix_type_dbus_array_isu (void); +GType the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void); + GType the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void); GType the_prefix_type_dbus_array_of_a_7bsv_7d (void); -GType the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void); - |