Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/gedit/files: gedit-2.30.2-tests-skip.patch
Date: Mon, 05 Jul 2010 12:35:41
Message-Id: 20100705123537.834F82C5F4@corvid.gentoo.org
1 pacho 10/07/05 12:35:37
2
3 Added: gedit-2.30.2-tests-skip.patch
4 Log:
5 Fix tests: Do not fail if remote mounting is not supported (bug #323659)
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-editors/gedit/files/gedit-2.30.2-tests-skip.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/files/gedit-2.30.2-tests-skip.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/files/gedit-2.30.2-tests-skip.patch?rev=1.1&content-type=text/plain
13
14 Index: gedit-2.30.2-tests-skip.patch
15 ===================================================================
16 From 3c6753513bfafd59f87c192f39a1f1caf7fce47f Mon Sep 17 00:00:00 2001
17 From: Ignacio Casal Quinteiro <icq@×××××.org>
18 Date: Tue, 29 Jun 2010 14:58:30 +0000
19 Subject: Do not fail if remote mounting is not supported. Fixes bug #621764.
20
21 ---
22 diff --git a/tests/document-saver.c b/tests/document-saver.c
23 index ef97fe6..c99b678 100644
24 --- a/tests/document-saver.c
25 +++ b/tests/document-saver.c
26 @@ -151,6 +151,10 @@ mount_ready_callback (GObject *object,
27 mount_success = TRUE;
28 g_error_free (error);
29 }
30 + else if (error && error->code == G_IO_ERROR_NOT_SUPPORTED)
31 + {
32 + g_error_free (error);
33 + }
34 else
35 {
36 g_assert_no_error (error);
37 @@ -220,7 +224,11 @@ test_saver (const gchar *filename_or_uri,
38 file = g_file_new_for_commandline_arg (filename_or_uri);
39 existed = g_file_query_exists (file, NULL);
40
41 - ensure_mounted (file);
42 + if (!ensure_mounted (file))
43 + {
44 + saver_test_data_free (data);
45 + return;
46 + }
47
48 gedit_document_save_as (document, file, gedit_encoding_get_utf8 (),
49 newline_type, 0, save_flags);
50 @@ -409,6 +417,12 @@ test_permissions (const gchar *uri,
51 g_file_delete (file, NULL, NULL);
52 stream = g_file_create (file, 0, NULL, &error);
53
54 + if (error && error->code == G_IO_ERROR_NOT_SUPPORTED)
55 + {
56 + g_error_free (error);
57 + return;
58 + }
59 +
60 g_assert_no_error (error);
61
62 g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, NULL);
63 --
64 cgit v0.8.3.1