r47834 - in /desktop/unstable/gcr/debian: changelog control control.in patches/0001-do-not-require-system-bus-for-running-test-suite.patch patches/series rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Apr 3 22:15:27 UTC 2016 

Author: biebl
Date: Sun Apr  3 22:15:27 2016
New Revision: 47834

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47834
Log:
Make test suite failures fatal. Run the test-suite using dbus-run-session
(requires Build-Depends on dbus) and disable the usage of the system bus
in one of the tests.

Added:
    desktop/unstable/gcr/debian/patches/0001-do-not-require-system-bus-for-running-test-suite.patch
Modified:
    desktop/unstable/gcr/debian/changelog
    desktop/unstable/gcr/debian/control
    desktop/unstable/gcr/debian/control.in
    desktop/unstable/gcr/debian/patches/series
    desktop/unstable/gcr/debian/rules

Modified: desktop/unstable/gcr/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/changelog?rev=47834&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gcr/debian/changelog	[utf-8] Sun Apr  3 22:15:27 2016
@@ -2,6 +2,9 @@
 
   * New upstream release.
   * Convert from cdbs to dh.
+  * Make test suite failures fatal. Run the test-suite using dbus-run-session
+    (requires Build-Depends on dbus) and disable the usage of the system bus
+    in one of the tests.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 03 Apr 2016 22:48:49 +0200
 

Modified: desktop/unstable/gcr/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control?rev=47834&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control	[utf-8] (original)
+++ desktop/unstable/gcr/debian/control	[utf-8] Sun Apr  3 22:15:27 2016
@@ -26,7 +26,8 @@
                libp11-kit-dev (>= 0.19.0),
                libglib2.0-doc,
                valac,
-               xsltproc
+               xsltproc,
+               dbus
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr

Modified: desktop/unstable/gcr/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control.in?rev=47834&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gcr/debian/control.in	[utf-8] Sun Apr  3 22:15:27 2016
@@ -22,7 +22,8 @@
                libp11-kit-dev (>= 0.19.0),
                libglib2.0-doc,
                valac,
-               xsltproc
+               xsltproc,
+               dbus
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr

Added: desktop/unstable/gcr/debian/patches/0001-do-not-require-system-bus-for-running-test-suite.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/patches/0001-do-not-require-system-bus-for-running-test-suite.patch?rev=47834&op=file
==============================================================================
--- desktop/unstable/gcr/debian/patches/0001-do-not-require-system-bus-for-running-test-suite.patch	(added)
+++ desktop/unstable/gcr/debian/patches/0001-do-not-require-system-bus-for-running-test-suite.patch	[utf-8] Sun Apr  3 22:15:27 2016
@@ -0,0 +1,46 @@
+From dc28810f06e2dc46eb6c1beef0cfba088ed1f68c Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Mon, 4 Apr 2016 00:07:36 +0200
+Subject: [PATCH] do not require system bus for running test suite
+
+Do not require system bus when running the test suite as this makes it
+harder to run the test suite in a restricted environment like on
+buildds. As the DBus connection seems to be unused, simply remove it
+altogether.
+---
+ gcr/test-system-prompt.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/gcr/test-system-prompt.c b/gcr/test-system-prompt.c
+index 3016252..703a7cb 100644
+--- a/gcr/test-system-prompt.c
++++ b/gcr/test-system-prompt.c
+@@ -697,7 +697,6 @@ static void
+ test_watch_cancels (Test *test,
+                     gconstpointer unused)
+ {
+-	GDBusConnection *connection;
+ 	GcrPrompt *prompt;
+ 	GcrPrompt *prompt2;
+ 	GError *error = NULL;
+@@ -707,9 +706,6 @@ test_watch_cancels (Test *test,
+ 	gcr_mock_prompter_set_delay_msec (3000);
+ 	gcr_mock_prompter_expect_password_ok ("booo", NULL);
+ 
+-	connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+-	g_assert_no_error (error);
+-
+ 	/* This should happen immediately */
+ 	prompt = gcr_system_prompt_open_for_prompter (test->prompter_name, 0, NULL, &error);
+ 	g_assert_no_error (error);
+@@ -744,7 +740,6 @@ test_watch_cancels (Test *test,
+ 	g_object_unref (prompt);
+ 	g_object_unref (pair.result1);
+ 	g_object_unref (pair.result2);
+-	g_object_unref (connection);
+ }
+ 
+ int
+-- 
+2.8.0.rc3
+

Modified: desktop/unstable/gcr/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/patches/series?rev=47834&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gcr/debian/patches/series	[utf-8] Sun Apr  3 22:15:27 2016
@@ -0,0 +1 @@
+0001-do-not-require-system-bus-for-running-test-suite.patch

Modified: desktop/unstable/gcr/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/rules?rev=47834&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/rules	[utf-8] (original)
+++ desktop/unstable/gcr/debian/rules	[utf-8] Sun Apr  3 22:15:27 2016
@@ -22,7 +22,7 @@
 		--disable-valgrind
 
 override_dh_auto_test:
-	make -k check || true
+	dbus-run-session -- make check
 
 override_dh_install:
 	dh_install --list-missing

More information about the pkg-gnome-commits mailing list