r46213 - in /desktop/unstable/gnome-keyring/debian: changelog patches/fix_tests_for_new_glib.patch patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Wed Sep 30 12:03:26 2015
New Revision: 46213

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46213
Log:
Make tests pass with GLib ≥ 2.45.7 (fix_tests_for_new_glib.patch).

Added:
    desktop/unstable/gnome-keyring/debian/patches/fix_tests_for_new_glib.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=46213&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Wed Sep 30 12:03:26 2015
@@ -3,6 +3,7 @@
   * New upstream release.
   * Drop fix_test_import_segfault.patch, applied upstream.
   * Set $HOME to debian/testhome when running the tests.
+  * Make tests pass with GLib ≥ 2.45.7 (fix_tests_for_new_glib.patch).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 28 Sep 2015 20:39:19 +0300
 

Added: desktop/unstable/gnome-keyring/debian/patches/fix_tests_for_new_glib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/fix_tests_for_new_glib.patch?rev=46213&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/fix_tests_for_new_glib.patch	(added)
+++ desktop/unstable/gnome-keyring/debian/patches/fix_tests_for_new_glib.patch	[utf-8] Wed Sep 30 12:03:26 2015
@@ -0,0 +1,56 @@
+Description: various tests fixes to make them pass with GLib ≥ 2.45.7
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=755873
+Last-Update: 2015-09-30
+
+--- a/build/tap-gtester
++++ b/build/tap-gtester
+@@ -79,6 +79,8 @@
+                        print "ok %d %s" % (self.test_num, self.test_name)
+                    if data == "FAIL":
+                        print "not ok %d %s", (self.test_num, self.test_name)
++                   if data == "SKIP":
++                       print "ok %d %s # skip" % (self.test_num, self.test_name)
+                self.test_name = None
+            elif cmd == "skipping":
+                if "/subprocess" not in data:
+--- a/egg/test-asn1x.c
++++ b/egg/test-asn1x.c
+@@ -186,7 +186,7 @@
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	for (i = 0; i < G_N_ELEMENTS (parse_test_fixtures); i++) {
+-		name = g_strdup_printf ("/asn1x/encode-decode-%s", parse_test_fixtures[i].identifier);
++		name = g_strdup_printf ("/asn1x/encode-decode-%d-%s", i, parse_test_fixtures[i].identifier);
+ 		g_test_add (name, Test, &parse_test_fixtures[i], setup_parsing, test_decode_encode, teardown);
+ 		g_free (name);
+ 	}
+--- a/pkcs11/gkm/test-transaction.c
++++ b/pkcs11/gkm/test-transaction.c
+@@ -541,10 +541,13 @@
+ 		};
+ 		int i;
+ 
++		gchar test_name[39];
+ 		for (i = 0; buffersizes[i]; i++)
+-			g_test_add ("/gkm/transaction/write_large_file",
+-				    Test, GUINT_TO_POINTER (buffersizes[i]),
++		{
++			g_sprintf (test_name, "/gkm/transaction/write_large_file_%u", buffersizes[i]);
++			g_test_add (test_name, Test, GUINT_TO_POINTER (buffersizes[i]),
+ 				    setup, test_write_large_file, teardown);
++		}
+ 	}
+ 
+ 	g_test_add ("/gkm/transaction/write_file_abort_gone", Test, NULL, setup, test_write_file_abort_gone, teardown);
+--- a/pkcs11/secret-store/test-secret-schema.c
++++ b/pkcs11/secret-store/test-secret-schema.c
+@@ -230,7 +230,7 @@
+ 	            Test, NULL, setup, test_match_network_xdg_schema_without_schema_locked, teardown);
+ 	g_test_add ("/secret-store/schema/note-xdg-schema-without-schema-unlocked",
+ 	            Test, NULL, setup, test_match_note_xdg_schema_without_schema_unlocked, teardown);
+-	g_test_add ("/secret-store/schema/unknown-schema-without-schema-locked",
++	g_test_add ("/secret-store/schema/note-xdg-schema-without-schema-locked",
+ 	            Test, NULL, setup, test_match_note_xdg_schema_without_schema_locked, teardown);
+ 	g_test_add ("/secret-store/schema/unknown-schema-without-schema-unlocked",
+ 	            Test, NULL, setup, test_match_unknown_xdg_schema_without_schema_unlocked, teardown);

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=46213&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Wed Sep 30 12:03:26 2015
@@ -1 +1,2 @@
 03_kfreebsd.patch
+fix_tests_for_new_glib.patch