Fix tests: Do not fail if remote mounting is not supported (bug #323659)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 65 insertions, 8 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 0989835aff3a..7a69c41c0583 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.303 2010/06/13 19:34:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.304 2010/07/05 12:35:36 pacho Exp $
+
+  05 Jul 2010; Pacho Ramos <pacho@gentoo.org> gedit-2.30.2.ebuild,
+  +files/gedit-2.30.2-tests-skip.patch:
+  Fix tests: Do not fail if remote mounting is not supported (bug #323659)
 
 *gedit-2.30.2 (13 Jun 2010)
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index d0146d2ff481..9491d1894011 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -5,19 +5,20 @@ AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0
 AUX gedit-2.22.1-fix-libtool-2.2.patch 250 RMD160 26f257916aaa2bc99bc54be02f60ee57129825a6 SHA1 a6df9ba1042e8001548c9e89f1e1f3cfbda0df31 SHA256 091fe2c54d41032f5f4857787e1235709349215db44060a3d07545aaacbfb0b9
 AUX gedit-2.26.3-external_tools_config.patch 1389 RMD160 3709a253e35bce544493232f6faa4982e537f366 SHA1 c64c30defa6bbb2101849bb74874ebaf98f9ed4b SHA256 c690607e75553d9a93cfd9b397c68247c7b4cfc804103b9240be108d519e7eb8
 AUX gedit-2.28.4-xml-syntax.patch 2427 RMD160 75a63fc542b5ae59c488808049e206d4a17e646b SHA1 2253c5d32d5eccc574c48ce58e49de936cf8ee4b SHA256 e99c38e7294e66e35664fc55419c909a3920593c47275b5524e40b6f35253b45
+AUX gedit-2.30.2-tests-skip.patch 1402 RMD160 ba1984f9207a57254be2f6904789f8403fc619c5 SHA1 42424dbb1472d55d3b2ba0a383154bd4c2935955 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9
 DIST gedit-2.26.3.tar.bz2 4527425 RMD160 4248dbbaad3df23203654e8c3a70198bd25a5f3e SHA1 57ee9519a1c28195fb5b5bafa06308d816246c53 SHA256 955be93a9c5d01849ab1e723c7bc6c25474a8ca5997396bae6fa0feb2bbdcb53
 DIST gedit-2.28.4.tar.bz2 4597928 RMD160 3bd518f8e91d04fcb6b7e06e59f27185a735aded SHA1 5f28f25c8b86cc8a5ba875121124099b94681d48 SHA256 56e72b15ecc2f27cb35c636f0efe2b78eaf463264d06d7bb33de830f38247932
 DIST gedit-2.30.2.tar.bz2 4715261 RMD160 7ecbcb850401e3c0df078e4ae9417f7224b707a5 SHA1 e016ac3b5ed35349ea84753eedcd314be0afa52d SHA256 bcaa3ececd38293524b12f793bc939268531ce7a2b7f49212362098cf36b1bd5
 EBUILD gedit-2.26.3-r1.ebuild 2053 RMD160 96920fad96420cf5a90107ea1ebeaa9ecaca9c8a SHA1 c7a2adebd7bf0fe067a177918577b2eaff2927d2 SHA256 54743c9392d090d1c01254d601cc5cf61b7fd5584496ff42bd2ec9cc1acbf380
 EBUILD gedit-2.26.3.ebuild 1900 RMD160 56c186a81bfe3d238ac923a2203496dd9795d1c6 SHA1 2912b6f7ddf06ec99eff7914355c33d98f53efda SHA256 32fde97ad815e0337dcf888e68cdce51dfa38a7a0bf61c5439f14e20bbddf5c6
 EBUILD gedit-2.28.4.ebuild 2251 RMD160 f0c30399bbcd6b9910e1dc15da11b12c16bf094c SHA1 5ef1d7808bda88551417416d950b99d43280b3b3 SHA256 e60c79c5b8a4f42cc94444103de35619fa8c6de71a613ba5fd76ad23dea72438
-EBUILD gedit-2.30.2.ebuild 1946 RMD160 4f557ed95f96a28e1034688ec3b4319c77cd304a SHA1 063ca133b95e467e61363b3c809aab0b6afcde22 SHA256 a53d403bff65a6d0f75c8f6b9344c463c48cda73998fd84b111ac238c6fe86c3
-MISC ChangeLog 37595 RMD160 e03b5d9f76c5b23434bb86a2831dbd70347b8386 SHA1 f80a424d116fddcc7b03c72d417b8817dd9175e2 SHA256 549356cd96d0a96737fd2f478c307d3502d7168a70ba33907ec6921721943213
+EBUILD gedit-2.30.2.ebuild 2050 RMD160 dec9ff45db3e655eac4740041117d0b7fa005af1 SHA1 a4ab91b9efe41481a9f1c37ffcf93952e84c576f SHA256 9ef2e5c2cdf1273b7fa5eb84e2d94809c0c6dba8ee1a39296c20de40ba0d5913
+MISC ChangeLog 37778 RMD160 0b187f59b7afee30e609ee856c2db6bda98b0d7f SHA1 210778c0263b0b63ee90efbfe165e9c410dc5463 SHA256 51b64e08053937e6240aee22d2543298cd410eb7e9a87cdd2964e4bd88acb4f3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVMuIACgkQCaWpQKGI+9SHOgCcChlyJG6RkPWhacgvReGb2uyz
-YSkAn1MhlcUyvThT8YjyGpNlj39U84Vf
-=vAd3
+iEYEARECAAYFAkwx0aEACgkQCaWpQKGI+9TcLgCfXx0yFfgbuLOgmGyirQAQt7fN
+RN8AnRQoJ4k24856MHiL7MwOhlNIXVWR
+=8viS
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.30.2-tests-skip.patch b/app-editors/gedit/files/gedit-2.30.2-tests-skip.patch
new file mode 100644
index 000000000000..4bec6c9c78d0
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.30.2-tests-skip.patch
@@ -0,0 +1,49 @@
+From 3c6753513bfafd59f87c192f39a1f1caf7fce47f Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Tue, 29 Jun 2010 14:58:30 +0000
+Subject: Do not fail if remote mounting is not supported. Fixes bug #621764.
+
+---
+diff --git a/tests/document-saver.c b/tests/document-saver.c
+index ef97fe6..c99b678 100644
+--- a/tests/document-saver.c
++++ b/tests/document-saver.c
+@@ -151,6 +151,10 @@ mount_ready_callback (GObject      *object,
+ 		mount_success = TRUE;
+ 		g_error_free (error);
+ 	}
++	else if (error && error->code == G_IO_ERROR_NOT_SUPPORTED)
++	{
++		g_error_free (error);
++	}
+ 	else
+ 	{
+ 		g_assert_no_error (error);
+@@ -220,7 +224,11 @@ test_saver (const gchar              *filename_or_uri,
+ 	file = g_file_new_for_commandline_arg (filename_or_uri);
+ 	existed = g_file_query_exists (file, NULL);
+ 
+-	ensure_mounted (file);
++	if (!ensure_mounted (file))
++	{
++		saver_test_data_free (data);
++		return;
++	}
+ 
+ 	gedit_document_save_as (document, file, gedit_encoding_get_utf8 (),
+ 			        newline_type, 0, save_flags);
+@@ -409,6 +417,12 @@ test_permissions (const gchar *uri,
+ 	g_file_delete (file, NULL, NULL);
+ 	stream = g_file_create (file, 0, NULL, &error);
+ 
++	if (error && error->code == G_IO_ERROR_NOT_SUPPORTED)
++	{
++		g_error_free (error);
++		return;
++	}
++
+ 	g_assert_no_error (error);
+ 
+ 	g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, NULL);
+--
+cgit v0.8.3.1
diff --git a/app-editors/gedit/gedit-2.30.2.ebuild b/app-editors/gedit/gedit-2.30.2.ebuild
index fbb38ab06900..a074ff686106 100644
--- a/app-editors/gedit/gedit-2.30.2.ebuild
+++ b/app-editors/gedit/gedit-2.30.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.2.ebuild,v 1.1 2010/06/13 19:34:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.2.ebuild,v 1.2 2010/07/05 12:35:36 pacho Exp $
 
 GCONF_DEBUG="no"
 
-inherit gnome2 python
+inherit gnome2 python eutils
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -58,6 +58,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Do not fail if remote mounting is not supported.
+	epatch "${FILESDIR}/${P}-tests-skip.patch"
+
 	# disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile