diff options
author | Ted Gould <ted@gould.cx> | 2010-07-15 10:02:16 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-07-15 10:02:16 -0500 |
commit | ae07d5739c05720238fdc42a79036ce14d458cd3 (patch) | |
tree | b42eeb972b29cac0c47e29fdbdb937337559d624 /tests | |
parent | 6c7db767475c20001d45dad1f0c670ef869c7af4 (diff) | |
parent | 081637af461f33c8ec1cd163f6fbc7a6c3efb63a (diff) | |
download | libayatana-indicator-ae07d5739c05720238fdc42a79036ce14d458cd3.tar.gz libayatana-indicator-ae07d5739c05720238fdc42a79036ce14d458cd3.tar.bz2 libayatana-indicator-ae07d5739c05720238fdc42a79036ce14d458cd3.zip |
* New upstream release.
* Fixing unwatching crash (LP: #603489)
* Adding configurable timeout for slow test systems
* Merged in fix for (LP: #603489)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.in | 5 | ||||
-rw-r--r-- | tests/service-version-manager.c | 64 |
2 files changed, 1 insertions, 68 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 5b2c2a6..ec74829 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -49,10 +49,7 @@ check_PROGRAMS = test-loader$(EXEEXT) test-desktop-shortcuts$(EXEEXT) \ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c deleted file mode 100644 index aedc0ed..0000000 --- a/tests/service-version-manager.c +++ /dev/null @@ -1,64 +0,0 @@ - -#include <glib.h> -#include "libindicator/indicator-service-manager.h" -#include "service-version-values.h" - -static GMainLoop * mainloop = NULL; -static gboolean con_good = FALSE; -static gboolean con_bad = FALSE; - -gboolean -timeout (gpointer data) -{ - g_debug("Timeout."); - g_main_loop_quit(mainloop); - return FALSE; -} - -void -connection_bad (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) -{ - if (!connected) return; - g_debug("Connection From Bad!"); - con_bad = TRUE; - return; -} - -void -connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) -{ - if (!connected) return; - g_debug("Connection From Good."); - con_good = TRUE; - return; -} - -int -main (int argc, char ** argv) -{ - g_type_init(); - g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); - g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); - - IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); - g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); - - IndicatorServiceManager * badis = indicator_service_manager_new_version("org.ayatana.version.bad", SERVICE_VERSION_GOOD); - g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_bad), NULL); - - g_timeout_add_seconds(1, timeout, NULL); - - mainloop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(mainloop); - - g_object_unref(goodis); - g_object_unref(badis); - - g_debug("Quiting"); - if (con_good && !con_bad) { - g_debug("Passed"); - return 0; - } - g_debug("Failed"); - return 1; -} |