[next] telepathy-glib: tests: eliminate duplicate test case paths

George Kiagiadakis gkiagia at kemper.freedesktop.org
Fri Dec 2 16:20:40 UTC 2016


Module: telepathy-glib
Branch: next
Commit: 1f15dc935b65a7296dcf815b4da31a3d3b68f116
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=1f15dc935b65a7296dcf815b4da31a3d3b68f116

Author: George Kiagiadakis <gkiagia at tolabaki.gr>
Date:   Sat Jun 18 11:33:59 2016 +0300

tests: eliminate duplicate test case paths

Seems like this doesn't work with recent versions of glib

---

 tests/dbus/account.c             | 8 ++++----
 tests/dbus/cm.c                  | 2 +-
 tests/dbus/contact-list-client.c | 2 +-
 tests/dbus/contact-lists.c       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/dbus/account.c b/tests/dbus/account.c
index 1df043a..c104978 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 ad42854..e0f18ea 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 a3f878a..bb4895d 100644
--- a/tests/dbus/contact-list-client.c
+++ b/tests/dbus/contact-list-client.c
@@ -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 43ab262..5e88a18 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",



More information about the telepathy-commits mailing list