Online Accounts: libsignon-glib

Merge lp:~mardy/libsignon-glib/packaging into lp:libsignon-glib

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Ken VanDine
Approved revision: 145
Merged at revision: 144
Proposed branch: lp:~mardy/libsignon-glib/packaging
Merge into: lp:libsignon-glib
Diff against target: 303 lines (+40/-36)
7 files modified
NEWS (+9/-0)
configure.ac (+2/-2)
debian/changelog (+11/-0)
debian/control (+1/-1)
debian/rules (+1/-0)
docs/reference/Makefile.am (+3/-3)
tests/check_signon.c (+13/-30)
To merge this branch: bzr merge lp:~mardy/libsignon-glib/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+167510@code.launchpad.net

Commit message

New upstream release.
  - Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
  - Tests: do not access invalidated objects
  - Remove calls to g_type_init()
  - Doc: mention that Identity::signout() clears password and tokens
  - Check that NEWS has been updated

Description of the change

* New upstream release.
  - Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
  - Tests: do not access invalidated objects
  - Remove calls to g_type_init()
  - Doc: mention that Identity::signout() clears password and tokens
  - Check that NEWS has been updated

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-raring-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libsignon-glib-ci/5/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libsignon-glib-autolanding/2/
Executed test runs:

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2013-02-05 14:44:15 +0000
3+++ NEWS 2013-06-05 11:51:14 +0000
4@@ -1,5 +1,14 @@
5 libsignon-glib NEWS
6
7+Version 1.10
8+------------
9+
10+* Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
11+* Tests: do not access invalidated objects
12+* Remove calls to g_type_init()
13+* Doc: mention that Identity::signout() clears password and tokens
14+* Check that NEWS has been updated
15+
16 Version 1.9
17 -----------
18
19
20=== modified file 'configure.ac'
21--- configure.ac 2013-02-05 14:50:27 +0000
22+++ configure.ac 2013-06-05 11:51:14 +0000
23@@ -1,7 +1,7 @@
24 dnl Process this file with autoconf to produce a configure script.
25 AC_PREREQ([2.64])
26 AC_INIT([libsignon-glib],
27- [1.9],
28+ [1.10],
29 [http://code.google.com/p/accounts-sso/issues/entry],
30 [libsignon-glib],
31 [http://code.google.com/p/accounts-sso/])
32@@ -28,7 +28,7 @@
33 [gio-2.0 >= 2.30
34 gio-unix-2.0
35 glib-2.0 >= 2.32
36- gobject-2.0
37+ gobject-2.0 >= 2.35.1
38 signond >= 8.40])
39 AC_SUBST(DEPS_CFLAGS)
40 AC_SUBST(DEPS_LIBS)
41
42=== modified file 'debian/changelog'
43--- debian/changelog 2013-05-02 07:36:30 +0000
44+++ debian/changelog 2013-06-05 11:51:14 +0000
45@@ -1,3 +1,14 @@
46+libsignon-glib (1.10-0ubuntu1) UNRELEASED; urgency=low
47+
48+ * New upstream release.
49+ - Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
50+ - Tests: do not access invalidated objects
51+ - Remove calls to g_type_init()
52+ - Doc: mention that Identity::signout() clears password and tokens
53+ - Check that NEWS has been updated
54+
55+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 05 Jun 2013 14:48:03 +0300
56+
57 libsignon-glib (1.9daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low
58
59 * Automatic snapshot from revision 142 (ubuntu-unity/next)
60
61=== modified file 'debian/control'
62--- debian/control 2013-01-23 02:17:19 +0000
63+++ debian/control 2013-06-05 11:51:14 +0000
64@@ -3,7 +3,7 @@
65 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
66 Build-Depends: debhelper (>= 9),
67 autotools-dev,
68- libglib2.0-dev,
69+ libglib2.0-dev (>= 2.35.1),
70 libgirepository1.0-dev,
71 gobject-introspection,
72 gir1.2-glib-2.0,
73
74=== modified file 'debian/rules'
75--- debian/rules 2013-01-23 18:05:50 +0000
76+++ debian/rules 2013-06-05 11:51:14 +0000
77@@ -15,6 +15,7 @@
78 rm debian/tmp/usr/lib/*/*.la
79 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
80 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
81+ rm -rf debian/tmp/usr/lib/python3/dist-packages/gi/overrides/__pycache__/
82 rm -rf debian/tmp/usr/doc/reference
83 dh_install --fail-missing
84 dh_python2 -pgir1.2-signon-1.0
85
86=== modified file 'docs/reference/Makefile.am'
87--- docs/reference/Makefile.am 2012-11-30 07:38:19 +0000
88+++ docs/reference/Makefile.am 2013-06-05 11:51:14 +0000
89@@ -80,6 +80,6 @@
90 # e.g. EXTRA_DIST += version.xml.in
91 #EXTRA_DIST +=
92
93-if ENABLE_GTK_DOC
94-TESTS = $(GTKDOC_CHECK)
95-endif
96+#if ENABLE_GTK_DOC
97+#TESTS = $(GTKDOC_CHECK)
98+#endif
99
100=== modified file 'tests/check_signon.c'
101--- tests/check_signon.c 2013-02-05 14:23:39 +0000
102+++ tests/check_signon.c 2013-06-05 11:51:14 +0000
103@@ -72,8 +72,6 @@
104
105 START_TEST(test_init)
106 {
107- g_type_init ();
108-
109 g_debug("%s", G_STRFUNC);
110 auth_service = signon_auth_service_new ();
111 main_loop = g_main_loop_new (NULL, FALSE);
112@@ -116,8 +114,6 @@
113
114 START_TEST(test_query_methods)
115 {
116- g_type_init ();
117-
118 g_debug("%s", G_STRFUNC);
119 if(!main_loop)
120 main_loop = g_main_loop_new (NULL, FALSE);
121@@ -187,8 +183,6 @@
122
123 START_TEST(test_query_mechanisms)
124 {
125- g_type_init ();
126-
127 g_debug("%s", G_STRFUNC);
128 auth_service = signon_auth_service_new ();
129
130@@ -254,8 +248,6 @@
131
132 START_TEST(test_auth_session_query_mechanisms)
133 {
134- g_type_init();
135-
136 GError *err = NULL;
137
138 g_debug("%s", G_STRFUNC);
139@@ -330,7 +322,6 @@
140
141 START_TEST(test_auth_session_query_mechanisms_nonexisting)
142 {
143- g_type_init();
144 GError *err = NULL;
145
146 g_debug("%s", G_STRFUNC);
147@@ -413,8 +404,9 @@
148
149 START_TEST(test_auth_session_creation)
150 {
151- g_type_init();
152 GError *err = NULL;
153+ gpointer auth_session_sentinel;
154+ gpointer idty_sentinel;
155
156 g_debug("%s", G_STRFUNC);
157 SignonIdentity *idty = signon_identity_new(NULL, NULL);
158@@ -426,12 +418,15 @@
159
160 fail_unless (auth_session != NULL, "Cannot create AuthSession object");
161
162+ g_object_add_weak_pointer (G_OBJECT (idty), &idty_sentinel);
163+ g_object_add_weak_pointer (G_OBJECT (auth_session), &auth_session_sentinel);
164+
165 g_object_unref (idty);
166 fail_unless (SIGNON_IS_IDENTITY(idty), "Identity must stay untill all its session are not destroyed");
167 g_object_unref (auth_session);
168
169- fail_if (SIGNON_IS_AUTH_SESSION(auth_session), "AuthSession is not synchronized with parent Identity");
170- fail_if (SIGNON_IS_IDENTITY(idty), "Identity is not synchronized with its AuthSession");
171+ fail_if (auth_session_sentinel != NULL, "AuthSession is not synchronized with parent Identity");
172+ fail_if (idty_sentinel != NULL, "Identity is not synchronized with its AuthSession");
173
174 g_clear_error(&err);
175 }
176@@ -439,7 +434,6 @@
177
178 START_TEST(test_auth_session_process)
179 {
180- g_type_init();
181 gint state_counter = 0;
182 GError *err = NULL;
183
184@@ -552,8 +546,6 @@
185
186 g_debug("%s", G_STRFUNC);
187
188- g_type_init ();
189-
190 auth_session = signon_auth_session_new (0, "nonexisting-method", &error);
191 fail_unless (auth_session != NULL, "Cannot create AuthSession object");
192 fail_unless (error == NULL);
193@@ -659,7 +651,6 @@
194
195 g_debug("%s", G_STRFUNC);
196
197- g_type_init();
198 main_loop = g_main_loop_new (NULL, FALSE);
199
200 identity = signon_identity_new ();
201@@ -759,8 +750,6 @@
202
203 START_TEST(test_get_existing_identity)
204 {
205- g_type_init ();
206-
207 g_debug("%s", G_STRFUNC);
208
209 main_loop = g_main_loop_new (NULL, FALSE);
210@@ -783,8 +772,6 @@
211
212 START_TEST(test_get_nonexisting_identity)
213 {
214- g_type_init ();
215-
216 g_debug("%s", G_STRFUNC);
217 identity = signon_identity_new_from_db(G_MAXINT);
218
219@@ -837,7 +824,6 @@
220
221 START_TEST(test_store_credentials_identity)
222 {
223- g_type_init ();
224 g_debug("%s", G_STRFUNC);
225 SignonIdentity *idty = signon_identity_new(NULL, NULL);
226 fail_unless (idty != NULL);
227@@ -894,7 +880,6 @@
228
229 START_TEST(test_verify_secret_identity)
230 {
231- g_type_init ();
232 g_debug("%s", G_STRFUNC);
233 SignonIdentity *idty = signon_identity_new(NULL, NULL);
234 fail_unless (idty != NULL);
235@@ -953,7 +938,6 @@
236
237 START_TEST(test_remove_identity)
238 {
239- g_type_init ();
240 g_debug("%s", G_STRFUNC);
241 SignonIdentity *idty = signon_identity_new();
242 fail_unless (idty != NULL);
243@@ -1108,7 +1092,6 @@
244 START_TEST(test_info_identity)
245 {
246 g_debug("%s", G_STRFUNC);
247- g_type_init ();
248 SignonIdentity *idty = signon_identity_new();
249 fail_unless (idty != NULL);
250 fail_unless (SIGNON_IS_IDENTITY (idty),
251@@ -1222,8 +1205,9 @@
252
253 START_TEST(test_signout_identity)
254 {
255+ gpointer as1_sentinel, as2_sentinel;
256+
257 g_debug("%s", G_STRFUNC);
258- g_type_init ();
259 SignonIdentity *idty = signon_identity_new();
260 fail_unless (idty != NULL);
261 fail_unless (SIGNON_IS_IDENTITY (idty),
262@@ -1267,13 +1251,15 @@
263 G_CALLBACK(identity_signout_signal_cb), &counter);
264 g_signal_connect (idty2, "signout",
265 G_CALLBACK(identity_signout_signal_cb), &counter);
266+ g_object_add_weak_pointer (G_OBJECT (as1), &as1_sentinel);
267+ g_object_add_weak_pointer (G_OBJECT (as2), &as2_sentinel);
268
269 signon_identity_signout (idty, identity_signout_cb, NULL);
270 g_main_loop_run (main_loop);
271
272 fail_unless (counter == 2, "Lost some of SIGNOUT signals");
273- fail_if (SIGNON_IS_AUTH_SESSION (as1), "Authsession1 was not destroyed after signout");
274- fail_if (SIGNON_IS_AUTH_SESSION (as2), "Authsession2 was not destroyed after signout");
275+ fail_if (as1_sentinel != NULL, "Authsession1 was not destroyed after signout");
276+ fail_if (as2_sentinel != NULL, "Authsession2 was not destroyed after signout");
277
278 g_object_unref (idty);
279 g_object_unref (idty2);
280@@ -1284,7 +1270,6 @@
281
282 START_TEST(test_unregistered_identity)
283 {
284- g_type_init ();
285 g_debug("%s", G_STRFUNC);
286 SignonIdentity *idty = signon_identity_new();
287 fail_unless (idty != NULL);
288@@ -1324,7 +1309,6 @@
289 START_TEST(test_unregistered_auth_session)
290 {
291 g_debug("%s", G_STRFUNC);
292- g_type_init ();
293 SignonIdentity *idty = signon_identity_new();
294 fail_unless (idty != NULL);
295 fail_unless (SIGNON_IS_IDENTITY (idty),
296@@ -1416,7 +1400,6 @@
297
298 g_debug ("%s", G_STRFUNC);
299
300- g_type_init ();
301 main_loop = g_main_loop_new (NULL, FALSE);
302
303 auth_session = signon_auth_session_new (0, "ssotest", &error);

Subscribers

People subscribed via source and target branches

to all changes: