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

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 :
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
=== modified file 'NEWS'
--- NEWS 2013-02-05 14:44:15 +0000
+++ NEWS 2013-06-05 11:51:14 +0000
@@ -1,5 +1,14 @@
1libsignon-glib NEWS1libsignon-glib NEWS
22
3Version 1.10
4------------
5
6* Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
7* Tests: do not access invalidated objects
8* Remove calls to g_type_init()
9* Doc: mention that Identity::signout() clears password and tokens
10* Check that NEWS has been updated
11
3Version 1.912Version 1.9
4-----------13-----------
514
615
=== modified file 'configure.ac'
--- configure.ac 2013-02-05 14:50:27 +0000
+++ configure.ac 2013-06-05 11:51:14 +0000
@@ -1,7 +1,7 @@
1dnl Process this file with autoconf to produce a configure script.1dnl Process this file with autoconf to produce a configure script.
2AC_PREREQ([2.64])2AC_PREREQ([2.64])
3AC_INIT([libsignon-glib],3AC_INIT([libsignon-glib],
4 [1.9],4 [1.10],
5 [http://code.google.com/p/accounts-sso/issues/entry],5 [http://code.google.com/p/accounts-sso/issues/entry],
6 [libsignon-glib],6 [libsignon-glib],
7 [http://code.google.com/p/accounts-sso/])7 [http://code.google.com/p/accounts-sso/])
@@ -28,7 +28,7 @@
28 [gio-2.0 >= 2.3028 [gio-2.0 >= 2.30
29 gio-unix-2.029 gio-unix-2.0
30 glib-2.0 >= 2.3230 glib-2.0 >= 2.32
31 gobject-2.031 gobject-2.0 >= 2.35.1
32 signond >= 8.40])32 signond >= 8.40])
33AC_SUBST(DEPS_CFLAGS)33AC_SUBST(DEPS_CFLAGS)
34AC_SUBST(DEPS_LIBS)34AC_SUBST(DEPS_LIBS)
3535
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-02 07:36:30 +0000
+++ debian/changelog 2013-06-05 11:51:14 +0000
@@ -1,3 +1,14 @@
1libsignon-glib (1.10-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release.
4 - Temporarily disable GTKDOC_CHECK, it tries to write a log to /usr/bin
5 - Tests: do not access invalidated objects
6 - Remove calls to g_type_init()
7 - Doc: mention that Identity::signout() clears password and tokens
8 - Check that NEWS has been updated
9
10 -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 05 Jun 2013 14:48:03 +0300
11
1libsignon-glib (1.9daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low12libsignon-glib (1.9daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low
213
3 * Automatic snapshot from revision 142 (ubuntu-unity/next)14 * Automatic snapshot from revision 142 (ubuntu-unity/next)
415
=== modified file 'debian/control'
--- debian/control 2013-01-23 02:17:19 +0000
+++ debian/control 2013-06-05 11:51:14 +0000
@@ -3,7 +3,7 @@
3Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>3Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
4Build-Depends: debhelper (>= 9),4Build-Depends: debhelper (>= 9),
5 autotools-dev,5 autotools-dev,
6 libglib2.0-dev,6 libglib2.0-dev (>= 2.35.1),
7 libgirepository1.0-dev,7 libgirepository1.0-dev,
8 gobject-introspection,8 gobject-introspection,
9 gir1.2-glib-2.0,9 gir1.2-glib-2.0,
1010
=== modified file 'debian/rules'
--- debian/rules 2013-01-23 18:05:50 +0000
+++ debian/rules 2013-06-05 11:51:14 +0000
@@ -15,6 +15,7 @@
15 rm debian/tmp/usr/lib/*/*.la15 rm debian/tmp/usr/lib/*/*.la
16 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc16 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
17 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo17 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
18 rm -rf debian/tmp/usr/lib/python3/dist-packages/gi/overrides/__pycache__/
18 rm -rf debian/tmp/usr/doc/reference19 rm -rf debian/tmp/usr/doc/reference
19 dh_install --fail-missing20 dh_install --fail-missing
20 dh_python2 -pgir1.2-signon-1.021 dh_python2 -pgir1.2-signon-1.0
2122
=== modified file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am 2012-11-30 07:38:19 +0000
+++ docs/reference/Makefile.am 2013-06-05 11:51:14 +0000
@@ -80,6 +80,6 @@
80# e.g. EXTRA_DIST += version.xml.in80# e.g. EXTRA_DIST += version.xml.in
81#EXTRA_DIST += 81#EXTRA_DIST +=
8282
83if ENABLE_GTK_DOC83#if ENABLE_GTK_DOC
84TESTS = $(GTKDOC_CHECK)84#TESTS = $(GTKDOC_CHECK)
85endif85#endif
8686
=== modified file 'tests/check_signon.c'
--- tests/check_signon.c 2013-02-05 14:23:39 +0000
+++ tests/check_signon.c 2013-06-05 11:51:14 +0000
@@ -72,8 +72,6 @@
7272
73START_TEST(test_init)73START_TEST(test_init)
74{74{
75 g_type_init ();
76
77 g_debug("%s", G_STRFUNC);75 g_debug("%s", G_STRFUNC);
78 auth_service = signon_auth_service_new ();76 auth_service = signon_auth_service_new ();
79 main_loop = g_main_loop_new (NULL, FALSE);77 main_loop = g_main_loop_new (NULL, FALSE);
@@ -116,8 +114,6 @@
116114
117START_TEST(test_query_methods)115START_TEST(test_query_methods)
118{116{
119 g_type_init ();
120
121 g_debug("%s", G_STRFUNC);117 g_debug("%s", G_STRFUNC);
122 if(!main_loop)118 if(!main_loop)
123 main_loop = g_main_loop_new (NULL, FALSE);119 main_loop = g_main_loop_new (NULL, FALSE);
@@ -187,8 +183,6 @@
187183
188START_TEST(test_query_mechanisms)184START_TEST(test_query_mechanisms)
189{185{
190 g_type_init ();
191
192 g_debug("%s", G_STRFUNC);186 g_debug("%s", G_STRFUNC);
193 auth_service = signon_auth_service_new ();187 auth_service = signon_auth_service_new ();
194188
@@ -254,8 +248,6 @@
254248
255START_TEST(test_auth_session_query_mechanisms)249START_TEST(test_auth_session_query_mechanisms)
256{250{
257 g_type_init();
258
259 GError *err = NULL;251 GError *err = NULL;
260252
261 g_debug("%s", G_STRFUNC);253 g_debug("%s", G_STRFUNC);
@@ -330,7 +322,6 @@
330322
331START_TEST(test_auth_session_query_mechanisms_nonexisting)323START_TEST(test_auth_session_query_mechanisms_nonexisting)
332{324{
333 g_type_init();
334 GError *err = NULL;325 GError *err = NULL;
335326
336 g_debug("%s", G_STRFUNC);327 g_debug("%s", G_STRFUNC);
@@ -413,8 +404,9 @@
413404
414START_TEST(test_auth_session_creation)405START_TEST(test_auth_session_creation)
415{406{
416 g_type_init();
417 GError *err = NULL;407 GError *err = NULL;
408 gpointer auth_session_sentinel;
409 gpointer idty_sentinel;
418410
419 g_debug("%s", G_STRFUNC);411 g_debug("%s", G_STRFUNC);
420 SignonIdentity *idty = signon_identity_new(NULL, NULL);412 SignonIdentity *idty = signon_identity_new(NULL, NULL);
@@ -426,12 +418,15 @@
426418
427 fail_unless (auth_session != NULL, "Cannot create AuthSession object");419 fail_unless (auth_session != NULL, "Cannot create AuthSession object");
428420
421 g_object_add_weak_pointer (G_OBJECT (idty), &idty_sentinel);
422 g_object_add_weak_pointer (G_OBJECT (auth_session), &auth_session_sentinel);
423
429 g_object_unref (idty);424 g_object_unref (idty);
430 fail_unless (SIGNON_IS_IDENTITY(idty), "Identity must stay untill all its session are not destroyed");425 fail_unless (SIGNON_IS_IDENTITY(idty), "Identity must stay untill all its session are not destroyed");
431 g_object_unref (auth_session);426 g_object_unref (auth_session);
432427
433 fail_if (SIGNON_IS_AUTH_SESSION(auth_session), "AuthSession is not synchronized with parent Identity");428 fail_if (auth_session_sentinel != NULL, "AuthSession is not synchronized with parent Identity");
434 fail_if (SIGNON_IS_IDENTITY(idty), "Identity is not synchronized with its AuthSession");429 fail_if (idty_sentinel != NULL, "Identity is not synchronized with its AuthSession");
435430
436 g_clear_error(&err);431 g_clear_error(&err);
437}432}
@@ -439,7 +434,6 @@
439434
440START_TEST(test_auth_session_process)435START_TEST(test_auth_session_process)
441{436{
442 g_type_init();
443 gint state_counter = 0;437 gint state_counter = 0;
444 GError *err = NULL;438 GError *err = NULL;
445439
@@ -552,8 +546,6 @@
552546
553 g_debug("%s", G_STRFUNC);547 g_debug("%s", G_STRFUNC);
554548
555 g_type_init ();
556
557 auth_session = signon_auth_session_new (0, "nonexisting-method", &error);549 auth_session = signon_auth_session_new (0, "nonexisting-method", &error);
558 fail_unless (auth_session != NULL, "Cannot create AuthSession object");550 fail_unless (auth_session != NULL, "Cannot create AuthSession object");
559 fail_unless (error == NULL);551 fail_unless (error == NULL);
@@ -659,7 +651,6 @@
659651
660 g_debug("%s", G_STRFUNC);652 g_debug("%s", G_STRFUNC);
661653
662 g_type_init();
663 main_loop = g_main_loop_new (NULL, FALSE);654 main_loop = g_main_loop_new (NULL, FALSE);
664655
665 identity = signon_identity_new ();656 identity = signon_identity_new ();
@@ -759,8 +750,6 @@
759750
760START_TEST(test_get_existing_identity)751START_TEST(test_get_existing_identity)
761{752{
762 g_type_init ();
763
764 g_debug("%s", G_STRFUNC);753 g_debug("%s", G_STRFUNC);
765754
766 main_loop = g_main_loop_new (NULL, FALSE);755 main_loop = g_main_loop_new (NULL, FALSE);
@@ -783,8 +772,6 @@
783772
784START_TEST(test_get_nonexisting_identity)773START_TEST(test_get_nonexisting_identity)
785{774{
786 g_type_init ();
787
788 g_debug("%s", G_STRFUNC);775 g_debug("%s", G_STRFUNC);
789 identity = signon_identity_new_from_db(G_MAXINT);776 identity = signon_identity_new_from_db(G_MAXINT);
790777
@@ -837,7 +824,6 @@
837824
838START_TEST(test_store_credentials_identity)825START_TEST(test_store_credentials_identity)
839{826{
840 g_type_init ();
841 g_debug("%s", G_STRFUNC);827 g_debug("%s", G_STRFUNC);
842 SignonIdentity *idty = signon_identity_new(NULL, NULL);828 SignonIdentity *idty = signon_identity_new(NULL, NULL);
843 fail_unless (idty != NULL);829 fail_unless (idty != NULL);
@@ -894,7 +880,6 @@
894880
895START_TEST(test_verify_secret_identity)881START_TEST(test_verify_secret_identity)
896{882{
897 g_type_init ();
898 g_debug("%s", G_STRFUNC);883 g_debug("%s", G_STRFUNC);
899 SignonIdentity *idty = signon_identity_new(NULL, NULL);884 SignonIdentity *idty = signon_identity_new(NULL, NULL);
900 fail_unless (idty != NULL);885 fail_unless (idty != NULL);
@@ -953,7 +938,6 @@
953938
954START_TEST(test_remove_identity)939START_TEST(test_remove_identity)
955{940{
956 g_type_init ();
957 g_debug("%s", G_STRFUNC);941 g_debug("%s", G_STRFUNC);
958 SignonIdentity *idty = signon_identity_new();942 SignonIdentity *idty = signon_identity_new();
959 fail_unless (idty != NULL);943 fail_unless (idty != NULL);
@@ -1108,7 +1092,6 @@
1108START_TEST(test_info_identity)1092START_TEST(test_info_identity)
1109{1093{
1110 g_debug("%s", G_STRFUNC);1094 g_debug("%s", G_STRFUNC);
1111 g_type_init ();
1112 SignonIdentity *idty = signon_identity_new();1095 SignonIdentity *idty = signon_identity_new();
1113 fail_unless (idty != NULL);1096 fail_unless (idty != NULL);
1114 fail_unless (SIGNON_IS_IDENTITY (idty),1097 fail_unless (SIGNON_IS_IDENTITY (idty),
@@ -1222,8 +1205,9 @@
12221205
1223START_TEST(test_signout_identity)1206START_TEST(test_signout_identity)
1224{1207{
1208 gpointer as1_sentinel, as2_sentinel;
1209
1225 g_debug("%s", G_STRFUNC);1210 g_debug("%s", G_STRFUNC);
1226 g_type_init ();
1227 SignonIdentity *idty = signon_identity_new();1211 SignonIdentity *idty = signon_identity_new();
1228 fail_unless (idty != NULL);1212 fail_unless (idty != NULL);
1229 fail_unless (SIGNON_IS_IDENTITY (idty),1213 fail_unless (SIGNON_IS_IDENTITY (idty),
@@ -1267,13 +1251,15 @@
1267 G_CALLBACK(identity_signout_signal_cb), &counter);1251 G_CALLBACK(identity_signout_signal_cb), &counter);
1268 g_signal_connect (idty2, "signout",1252 g_signal_connect (idty2, "signout",
1269 G_CALLBACK(identity_signout_signal_cb), &counter);1253 G_CALLBACK(identity_signout_signal_cb), &counter);
1254 g_object_add_weak_pointer (G_OBJECT (as1), &as1_sentinel);
1255 g_object_add_weak_pointer (G_OBJECT (as2), &as2_sentinel);
12701256
1271 signon_identity_signout (idty, identity_signout_cb, NULL);1257 signon_identity_signout (idty, identity_signout_cb, NULL);
1272 g_main_loop_run (main_loop);1258 g_main_loop_run (main_loop);
12731259
1274 fail_unless (counter == 2, "Lost some of SIGNOUT signals");1260 fail_unless (counter == 2, "Lost some of SIGNOUT signals");
1275 fail_if (SIGNON_IS_AUTH_SESSION (as1), "Authsession1 was not destroyed after signout");1261 fail_if (as1_sentinel != NULL, "Authsession1 was not destroyed after signout");
1276 fail_if (SIGNON_IS_AUTH_SESSION (as2), "Authsession2 was not destroyed after signout");1262 fail_if (as2_sentinel != NULL, "Authsession2 was not destroyed after signout");
12771263
1278 g_object_unref (idty);1264 g_object_unref (idty);
1279 g_object_unref (idty2);1265 g_object_unref (idty2);
@@ -1284,7 +1270,6 @@
12841270
1285START_TEST(test_unregistered_identity)1271START_TEST(test_unregistered_identity)
1286{1272{
1287 g_type_init ();
1288 g_debug("%s", G_STRFUNC);1273 g_debug("%s", G_STRFUNC);
1289 SignonIdentity *idty = signon_identity_new();1274 SignonIdentity *idty = signon_identity_new();
1290 fail_unless (idty != NULL);1275 fail_unless (idty != NULL);
@@ -1324,7 +1309,6 @@
1324START_TEST(test_unregistered_auth_session)1309START_TEST(test_unregistered_auth_session)
1325{1310{
1326 g_debug("%s", G_STRFUNC);1311 g_debug("%s", G_STRFUNC);
1327 g_type_init ();
1328 SignonIdentity *idty = signon_identity_new();1312 SignonIdentity *idty = signon_identity_new();
1329 fail_unless (idty != NULL);1313 fail_unless (idty != NULL);
1330 fail_unless (SIGNON_IS_IDENTITY (idty),1314 fail_unless (SIGNON_IS_IDENTITY (idty),
@@ -1416,7 +1400,6 @@
14161400
1417 g_debug ("%s", G_STRFUNC);1401 g_debug ("%s", G_STRFUNC);
14181402
1419 g_type_init ();
1420 main_loop = g_main_loop_new (NULL, FALSE);1403 main_loop = g_main_loop_new (NULL, FALSE);
14211404
1422 auth_session = signon_auth_session_new (0, "ssotest", &error);1405 auth_session = signon_auth_session_new (0, "ssotest", &error);

Subscribers

People subscribed via source and target branches

to all changes: