From 35683feaeda793ac2951140bcd5b4b2163cab647 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 6 Dec 2012 10:23:51 -0500 Subject: Temporarily disable gtk-doc completeness tests until they can be fixed. --- debian/changelog | 2 +- debian/rules | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7643608..4bad68e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. - Override dh_autoreconf to run autogen.sh and not call configure. - Override dh_auto_test to run tests per-flavor. - - Temporarily disable tests. + - Temporarily disable gtk-doc completeness tests until they can be fixed. * debian/*.install: - Update paths for multiarch and for use with dh9 (remove debian/tmp...) diff --git a/debian/rules b/debian/rules index c4f16bc..ae06afc 100755 --- a/debian/rules +++ b/debian/rules @@ -72,14 +72,21 @@ override_dh_install: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - #dh_auto_test --builddirectory=build/$* + # + # Not running the gtk-doc tests to check that the documentation is complete... + # + dh_auto_test --builddirectory=build/$* -- -C tests + dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) # GTK2 flavor test was run on a per-python-version basis. dotestgtk2-%: - #PYTHON=`which $*` \ - # dh_auto_test --builddirectory=build/gtk2 + # + # Not running the gtk-doc tests to check that the documentation is complete... + # + PYTHON=`which $*` \ + dh_auto_test --builddirectory=build/gtk2 -- -C tests override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3 From db9a00b33653e9ebc1820b2ffa7a89836466d5a6 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 6 Dec 2012 10:30:29 -0500 Subject: Add reference to the bug we're waiting for a fix for; re: gtk-doc completeness, missing links and undocumented symbols --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index ae06afc..fe79c71 100755 --- a/debian/rules +++ b/debian/rules @@ -74,6 +74,7 @@ override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: # # Not running the gtk-doc tests to check that the documentation is complete... + # See bug (LP: #1083425) # dh_auto_test --builddirectory=build/$* -- -C tests @@ -84,6 +85,7 @@ dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) dotestgtk2-%: # # Not running the gtk-doc tests to check that the documentation is complete... + # See bug (LP: #1083425) # PYTHON=`which $*` \ dh_auto_test --builddirectory=build/gtk2 -- -C tests -- cgit v1.2.3 From 06056540ac3d9f8f11d13bb9d5cb6a5f8d62584d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 7 Dec 2012 17:57:05 -0500 Subject: Re-enable docs --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index fe79c71..62f99e4 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ dotest-%: # Not running the gtk-doc tests to check that the documentation is complete... # See bug (LP: #1083425) # - dh_auto_test --builddirectory=build/$* -- -C tests + dh_auto_test --builddirectory=build/$* -- dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) @@ -88,7 +88,7 @@ dotestgtk2-%: # See bug (LP: #1083425) # PYTHON=`which $*` \ - dh_auto_test --builddirectory=build/gtk2 -- -C tests + dh_auto_test --builddirectory=build/gtk2 -- override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3 From 8aad2505fc5e0e92fbf704bee635d5672f071eb5 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 10 Dec 2012 22:51:01 -0500 Subject: Remove entry about disabling tests for documentation: they're fixed. --- debian/changelog | 1 - debian/rules | 8 -------- 2 files changed, 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6c9ef81..3b8c5b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,6 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. - Override dh_autoreconf to run autogen.sh and not call configure. - Override dh_auto_test to run tests per-flavor. - - Temporarily disable gtk-doc completeness tests until they can be fixed. * debian/*.install: - Update paths for multiarch and for use with dh9 (remove debian/tmp...) * Fix gtkdoc tests and building of the documentation given a separate build diff --git a/debian/rules b/debian/rules index 62f99e4..4637722 100755 --- a/debian/rules +++ b/debian/rules @@ -72,10 +72,6 @@ override_dh_install: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - # - # Not running the gtk-doc tests to check that the documentation is complete... - # See bug (LP: #1083425) - # dh_auto_test --builddirectory=build/$* -- @@ -83,10 +79,6 @@ dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) # GTK2 flavor test was run on a per-python-version basis. dotestgtk2-%: - # - # Not running the gtk-doc tests to check that the documentation is complete... - # See bug (LP: #1083425) - # PYTHON=`which $*` \ dh_auto_test --builddirectory=build/gtk2 -- -- cgit v1.2.3 From b598e7cb3fc5491d93debde743f5e67037dfb6f1 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 8 Jan 2013 10:33:31 -0500 Subject: More traces --- debian/changelog | 2 +- debian/rules | 4 ++++ tests/Makefile.am | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b8c5b0..52eed2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low +libappindicator (12.10.9-0ubuntu1~mtrudel1) raring; urgency=low * debian/control: - Update style: use trailing commas at the end of dependency lists. diff --git a/debian/rules b/debian/rules index 4637722..5da5273 100755 --- a/debian/rules +++ b/debian/rules @@ -72,6 +72,8 @@ override_dh_install: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: + ps -ef + env dh_auto_test --builddirectory=build/$* -- @@ -79,6 +81,8 @@ dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) # GTK2 flavor test was run on a per-python-version basis. dotestgtk2-%: + ps -ef + env PYTHON=`which $*` \ dh_auto_test --builddirectory=build/gtk2 -- diff --git a/tests/Makefile.am b/tests/Makefile.am index a65f320..4d3be1c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,6 +137,8 @@ test_libappindicator_fallback_item_LDADD = \ test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @echo "#!/bin/bash" > $@ + @echo export DISPLAY= >> $@ + @echo killall at-spi2-registryd >> $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@ @chmod +x $@ @@ -152,6 +154,8 @@ HTML_REPORT = libappindicator-check-results.html libappindicator-tests: libappindicator-tests-gtester Makefile.am @echo "#!/bin/bash" > $@ + @echo export DISPLAY= >> $@ + @echo killall at-spi2-registryd >> $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo export UBUNTU_MENUPROXY= >> $@ @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ @@ -170,6 +174,8 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.c test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am @echo "#!/bin/bash" > test-libappindicator-dbus + @echo export DISPLAY= >> $@ + @echo killall at-spi2-registryd >> $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus @chmod +x test-libappindicator-dbus @@ -179,6 +185,8 @@ XFAIL_TESTS = test-libappindicator-dbus test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am @echo "#!/bin/bash" > test-libappindicator-status + @echo export DISPLAY= >> $@ + @echo killall at-spi2-registryd >> $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status @chmod +x test-libappindicator-status -- cgit v1.2.3 From 616555a9509f3b1f313ea3056e30c48737eeb908 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 10 Jan 2013 17:18:55 -0500 Subject: some packaging fixes to make tests more resistant to timing issues and warnings from sub-libraries --- debian/rules | 1 + tests/test-libappindicator-fallback-item.c | 2 +- tests/test-libappindicator-fallback-watcher.c | 3 ++- tests/test-libappindicator.c | 28 +++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 4637722..8512858 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ CFLAGS += -fPIC # Note: No cli here so that the pbuilder stuff works clean: dh_clean + dh_autoreconf_clean override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c index 418b779..c87ef8c 100644 --- a/tests/test-libappindicator-fallback-item.c +++ b/tests/test-libappindicator-fallback-item.c @@ -138,7 +138,7 @@ main (int argc, char ** argv) GtkWidget * menu = gtk_menu_new(); app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu)); - g_timeout_add_seconds(2, kill_func, NULL); + g_timeout_add_seconds(20, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 5494082..f337150 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -77,6 +77,7 @@ main (int argv, char ** argc) while (!has_owner && owner_count < 10000) { org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL); owner_count++; + g_usleep(500000); } if (owner_count == 10000) { @@ -104,7 +105,7 @@ main (int argv, char ** argc) /* This is the final kill function. It really shouldn't happen unless we get an error. */ - g_timeout_add(2000, kill_func, NULL); + g_timeout_add_seconds(20, kill_func, NULL); g_debug("Entering Mainloop"); diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 7afd3ba..0c69fde 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -28,6 +28,16 @@ with this program. If not, see . #include #include +static gboolean +allow_warnings (const gchar *log_domain, GLogLevelFlags log_level, + const gchar *message, gpointer user_data) +{ + // By default, gtest will fail a test on even a warning message. + // But since some of our sub-libraries are noisy (especially at-spi2), + // only fail on critical or worse. + return ((log_level & G_LOG_LEVEL_MASK) <= G_LOG_LEVEL_CRITICAL); +} + void test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated) { @@ -45,6 +55,8 @@ test_libappindicator_prop_signals_helper (AppIndicator * ci, gboolean * signalac void test_libappindicator_prop_signals (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("test-app-indicator", "indicator-messages", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -115,6 +127,8 @@ test_libappindicator_prop_signals (void) void test_libappindicator_init_set_props (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -139,6 +153,8 @@ test_libappindicator_init_set_props (void) void test_libappindicator_init_with_props (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -161,6 +177,8 @@ test_libappindicator_init_with_props (void) void test_libappindicator_init (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); g_assert(ci != NULL); g_object_unref(G_OBJECT(ci)); @@ -170,6 +188,8 @@ test_libappindicator_init (void) void test_libappindicator_set_label (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -232,6 +252,8 @@ test_libappindicator_set_label (void) void test_libappindicator_set_menu (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -301,6 +323,8 @@ label_signals_check (void) void test_libappindicator_label_signals (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + gint label_signals_count = 0; AppIndicator * ci = app_indicator_new ("my-id", "my-name", @@ -352,6 +376,8 @@ test_libappindicator_label_signals (void) void test_libappindicator_desktop_menu (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); @@ -388,6 +414,8 @@ test_libappindicator_desktop_menu (void) void test_libappindicator_desktop_menu_bad (void) { + g_test_log_set_fatal_handler (allow_warnings, NULL); + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu-bad", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -- cgit v1.2.3