Merge lp:~online-accounts/libsignon-glib/packaging into lp:libsignon-glib

[Alberto Mardegan]

Migrate to GTask

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-i386-ci/4

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

review: Approve (continuous-integration)

[lp:~online-accounts/libsignon-glib/packaging]

159. By Alberto Mardegan on 2016-05-20

Migrate to GTask
Approved by: PS Jenkins bot

=== added file '.gitlab-ci.yml'
--- .gitlab-ci.yml	1970-01-01 00:00:00 +0000
+++ .gitlab-ci.yml	2016-05-19 15:30:34 +0000
@@ -0,0 +1,47 @@
+image: ubuntu:xenial
+
+cache:
+  key: apt-cache
+  paths:
+  - apt-cache/
+
+before_script:
+  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -yq autotools-dev gobject-introspection gtk-doc-tools libgirepository1.0-dev libglib2.0-dev libtool python3 python3-gi python-gi-dev signond-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -yq signon-plugin-ssotest check dbus-test-runner lcov gcovr
+
+build_amd64:
+  stage: build
+  script:
+    - export PYTHON=python3
+    - mkdir build
+    - cd build
+    - ../autogen.sh --enable-gtk-doc --enable-gcov --enable-debug --enable-python --prefix=/usr
+    - make -j 4
+  artifacts:
+    paths:
+      - ./
+
+test_amd64:
+  stage: test
+  script:
+    - cd build
+    - make check || (cat tests/test-suite.log && /bin/false)
+    - make coverage-html
+  dependencies:
+    - build_amd64
+  artifacts:
+    paths:
+      - ./
+
+pages:
+  stage: deploy
+  script:
+    - mkdir public
+    - cp -a build/coveragereport public/coverage
+    - cp -a build/docs/reference/html/* public/
+  dependencies:
+    - test_amd64
+  artifacts:
+    paths:
+      - public
 
=== modified file 'Makefile.am'
--- Makefile.am	2012-10-30 09:28:39 +0000
+++ Makefile.am	2016-05-19 15:30:34 +0000
@@ -12,6 +12,8 @@
 SUBDIRS += tests
 endif
 
+include $(top_srcdir)/Makefile.am.coverage
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_in_files = libsignon-glib.pc.in
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
=== added file 'Makefile.am.coverage'
--- Makefile.am.coverage	1970-01-01 00:00:00 +0000
+++ Makefile.am.coverage	2016-05-19 15:30:34 +0000
@@ -0,0 +1,38 @@
+
+# Coverage targets
+
+.PHONY: clean-gcda
+clean-gcda:
+	@echo Removing old coverage results
+	-$(AM_V_at)find -name '*.gcda' -print | xargs -r rm
+
+.PHONY: coverage-html generate-coverage-html clean-coverage-html
+coverage-html: clean-gcda
+	-$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+if HAVE_GCOV
+
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(AM_V_at)$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	$(AM_V_at)$(LCOV) --remove coverage.info signon-enum-types.c signon-errors-enum.c signon-marshal.c "sso-*-gen.*" -o coverage.info # autogenerated files
+	$(AM_V_at)LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+
+clean-coverage-html: clean-gcda
+	-$(AM_V_at)$(LCOV) --directory $(top_builddir) -z
+	-$(AM_V_at)rm -rf coverage.info coveragereport
+
+clean-local: clean-coverage-html
+
+else
+
+generate-coverage-html:
+	$(AM_V_at)echo "Code coverage reporting not available"
+
+clean-coverage-html: clean-gcda
+	-$(AM_V_at)rm -rf coverage.info coveragereport
+
+clean-local: clean-coverage-html
+
+endif # HAVE_GCOV
 
=== modified file 'NEWS'
--- NEWS	2014-12-09 08:52:37 +0000
+++ NEWS	2016-05-19 15:30:34 +0000
@@ -1,5 +1,26 @@
 libsignon-glib NEWS
 
+Version 1.14
+------------
+
+* Migrate to GTask
+* Fix memory leaks reported by valgrind
+* Enable CI in gitlab.com
+* Build: add test coverage reporting
+* Build: fix parallel builds and out-of-tree builds
+* Tests: add a test for signon_auth_session_process_async()
+* Tests: allow running tests with valgrind
+
+Version 1.13
+------------
+
+* Build: don't emit a build error on deprecations
+* Build: ignore deprecations of GSimpleAsyncResult
+* pkg-config: remove unused variable
+  Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
+* Tests: do not count on mechanisms being ordered
+* Introspection: mark ACL and realms as string lists, update Vala bindings
+
 Version 1.12
 ------------
 
 
=== removed file 'README'
--- README	2015-11-27 02:48:53 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-Single signon authentication library for GLib applications
-----------------------------------------------------------
-
-This project is a library for managing single signon credentilas which can be
-used from GLib applications. It is effectively a GLib binding for the D-Bus API
-provided by signond. It is part of the accounts-sso project:
-
-https://gitlab.com/groups/accounts-sso
-
-Dependencies
-------------
-
-The project depends on GLib (including GIO and GObject), signond and check.
-
-Licence
--------
-
-The library is licensed under the GNU LGPL version 2.1.
-
-Resources
----------
-
-https://gitlab.com/accounts-sso/libsignon-glib
 
=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2016-05-19 15:30:34 +0000
@@ -0,0 +1,29 @@
+Single signon authentication library for GLib applications
+==========================================================
+
+This project is a library for managing single signon credentilas which can be
+used from GLib applications. It is effectively a GLib binding for the D-Bus API
+provided by [signond][].
+It is part of the accounts-sso project:
+
+https://gitlab.com/groups/accounts-sso
+
+Dependencies
+------------
+
+The project depends on GLib (including GIO and GObject), [signond][] and [check][].
+
+Licence
+-------
+
+The library is licensed under the GNU LGPL version 2.1.
+
+Resources
+---------
+
+[API reference documentation](http://accounts-sso.gitlab.io/libsignon-glib/)
+
+[Official source code repository](https://gitlab.com/accounts-sso/libsignon-glib)
+
+[signond]: https://gitlab.com/accounts-sso/signond
+[check]: https://github.com/libcheck/check
 
=== modified file 'configure.ac'
--- configure.ac	2015-12-09 07:59:54 +0000
+++ configure.ac	2016-05-19 15:30:34 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libsignon-glib],
-        [1.13],
+        [1.14],
         [https://gitlab.com/accounts-sso/libsignon-glib/issues],
         [libsignon-glib],
         [https://gitlab.com/accounts-sso/libsignon-glib])
@@ -11,7 +11,7 @@
 AC_CONFIG_SRCDIR([libsignon-glib.pc.in])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects])
+AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects foreign])
 
 AC_PROG_CC
 AC_PROG_CC_STDC
@@ -25,7 +25,7 @@
 
 PKG_CHECK_MODULES(
     [DEPS],
-    [gio-2.0 >= 2.30
+    [gio-2.0 >= 2.36
      gio-unix-2.0
      glib-2.0 >= 2.32
      gobject-2.0 >= 2.35.1
@@ -51,6 +51,13 @@
   [AS_IF([test "x$enable_tests" = "xyes"],
     [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
 
+# gcov coverage reporting
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_CXXFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
 
 GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
@@ -75,11 +82,6 @@
 AS_IF([test "x$enable_debug" = "xyes"],
     [CFLAGS="$CFLAGS -DENABLE_DEBUG"])
 
-AC_ARG_ENABLE([coverage],
-    [AS_HELP_STRING([--enable-coverage], [compile with coverage info])])
-AS_IF([test "x$enable_coverage" = "xyes"],
-    [CFLAGS="$CFLAGS -g -fprofile-arcs -ftest-coverage"])
-
 # Python support.
 PYGOBJECT_REQUIRED=2.90
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-09 10:24:53 +0000
+++ debian/changelog	2016-05-19 15:30:34 +0000
@@ -1,3 +1,16 @@
+libsignon-glib (1.14-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Migrate to GTask (LP: #1577373)
+    - Fix memory leaks reported by valgrind
+    - Enable CI in gitlab.com
+    - Build: add test coverage reporting
+    - Build: fix parallel builds and out-of-tree builds
+    - Tests: add a test for signon_auth_session_process_async()
+    - Tests: allow running tests with valgrind
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 19 May 2016 18:28:23 +0300
+
 libsignon-glib (1.13+16.04.20151209.1-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'libsignon-glib/Makefile.am'
--- libsignon-glib/Makefile.am	2015-12-02 08:57:16 +0000
+++ libsignon-glib/Makefile.am	2016-05-19 15:30:34 +0000
@@ -5,11 +5,14 @@
 	-I$(top_srcdir) \
 	-I$(srcdir) \
 	-I$(top_builddir) \
-	-I$(builddir) \
+	-I$(builddir)
+libsignon_glib_la_CFLAGS = \
 	$(DEPS_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
 	-Wall -Werror -Wno-error=deprecated-declarations
 libsignon_glib_la_LIBADD = $(DEPS_LIBS)
 libsignon_glib_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
 	-version-info 1:0:0 \
 	-export-symbols-regex '^signon_'
 
@@ -75,8 +78,7 @@
 	signon-auth-session.h \
 	signon-identity-info.h
 
-# This should come from `pkg-config --variable=interfaces_dir dbus-1`
-DBUS_INTERFACES_DIR = /usr/share/dbus-1/interfaces
+DBUS_INTERFACES_DIR = $(datadir)/dbus-1/interfaces
 
 sso-auth-service-gen.h sso-auth-service-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
 	$(AM_V_GEN)gdbus-codegen \
@@ -145,9 +147,9 @@
 	    --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
 	    signon-errors.h ) | \
 	    $(SED) -e 's/SEDSIGNON_ERROR_\([^,]*\)/SIGNOND_\1_ERR_NAME/' \
-	    > xgen-getc \
-	    && cp xgen-getc signon-errors-enum.c  \
-	    && rm -f xgen-getc
+	    > xgen-getc-enum \
+	    && cp xgen-getc-enum signon-errors-enum.c  \
+	    && rm -f xgen-getc-enum
 
 signon-errors-map.c: Makefile signon-errors.h
 	$(AM_V_GEN)( cd $(srcdir) && \
@@ -189,6 +191,7 @@
 	--warn-all
 Signon_1_0_gir_CFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	$(DEPS_CFLAGS)
 Signon_1_0_gir_LIBS = libsignon-glib.la
 Signon_1_0_gir_FILES = $(introspection_sources)
 
=== modified file 'libsignon-glib/signon-auth-service.c'
--- libsignon-glib/signon-auth-service.c	2014-12-05 07:15:03 +0000
+++ libsignon-glib/signon-auth-service.c	2016-05-19 15:30:34 +0000
@@ -86,6 +86,7 @@
     if (priv->cancellable)
     {
         g_cancellable_cancel (priv->cancellable);
+        g_object_unref (priv->cancellable);
         priv->cancellable = NULL;
     }
 
 
=== modified file 'libsignon-glib/signon-auth-session.c'
--- libsignon-glib/signon-auth-session.c	2015-12-02 08:40:47 +0000
+++ libsignon-glib/signon-auth-session.c	2016-05-19 15:30:34 +0000
@@ -93,7 +93,6 @@
 {
     GVariant *session_data;
     gchar *mechanism;
-    GCancellable *cancellable;
 } AuthSessionProcessData;
 
 typedef struct _AuthSessionQueryAvailableMechanismsCbData
@@ -138,7 +137,7 @@
 {
     SignonAuthSession *self;
     SsoAuthSession *proxy = SSO_AUTH_SESSION (object);
-    GSimpleAsyncResult *res_process = (GSimpleAsyncResult *)userdata;
+    GTask *res_process = userdata;
     GVariant *reply;
     GError *error = NULL;
 
@@ -146,29 +145,20 @@
 
     sso_auth_session_call_process_finish (proxy, &reply, res, &error);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    self = SIGNON_AUTH_SESSION (g_async_result_get_source_object (
-        (GAsyncResult *)res_process));
+    self = SIGNON_AUTH_SESSION (g_task_get_source_object (res_process));
     self->priv->busy = FALSE;
 
     if (G_LIKELY (error == NULL))
     {
-        g_simple_async_result_set_op_res_gpointer (res_process, reply,
-                                                   (GDestroyNotify)
-                                                   g_variant_unref);
+        g_task_return_pointer (res_process, reply,
+                               (GDestroyNotify) g_variant_unref);
     }
     else
     {
-        g_simple_async_result_take_error (res_process, error);
+        g_task_return_error (res_process, error);
     }
 
-    /* We use the idle variant in order to avoid the following critical
-     * message:
-     * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
-     */
-    g_simple_async_result_complete_in_idle (res_process);
-G_GNUC_END_IGNORE_DEPRECATIONS
-    g_object_unref (self);
+    g_object_unref (res_process);
 }
 
 static void
@@ -176,18 +166,17 @@
 {
     SignonAuthSession *self = SIGNON_AUTH_SESSION (object);
     SignonAuthSessionPrivate *priv;
-    GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data);
+    GTask *res = G_TASK (user_data);
     AuthSessionProcessData *process_data;
 
     g_return_if_fail (self != NULL);
     priv = self->priv;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     if (error != NULL)
     {
         DEBUG ("AuthSessionError: %s", error->message);
-        g_simple_async_result_set_from_error (res, error);
-        g_simple_async_result_complete (res);
+        g_task_return_error (res, g_error_copy (error));
+        g_object_unref (res);
         return;
     }
 
@@ -195,14 +184,13 @@
     {
         priv->busy = FALSE;
         priv->canceled = FALSE;
-        g_simple_async_result_set_error (res,
-                                         signon_error_quark (),
-                                         SIGNON_ERROR_SESSION_CANCELED,
-                                         "Authentication session was canceled");
-        g_simple_async_result_complete (res);
+        g_task_return_new_error (res,
+                                 signon_error_quark (),
+                                 SIGNON_ERROR_SESSION_CANCELED,
+                                 "Authentication session was canceled");
+        g_object_unref (res);
         return;
     }
-G_GNUC_END_IGNORE_DEPRECATIONS
 
     process_data = g_object_get_data ((GObject *)res, data_key_process);
     g_return_if_fail (process_data != NULL);
@@ -210,7 +198,7 @@
     sso_auth_session_call_process (priv->proxy,
                                    process_data->session_data,
                                    process_data->mechanism,
-                                   process_data->cancellable,
+                                   g_task_get_cancellable (res),
                                    auth_session_process_reply,
                                    res);
 
@@ -254,7 +242,6 @@
 
     g_slice_free (AuthSessionProcessCbData, cb_data);
     g_clear_error (&error);
-    g_object_unref (res);
 }
 
 static void
@@ -432,8 +419,6 @@
 {
     g_return_if_fail (SIGNON_IS_AUTH_SESSION (self));
 
-    SignonAuthSessionPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
     g_return_if_fail (id >= 0);
 
     auth_session_check_remote_object(self);
@@ -490,9 +475,6 @@
                                                 gpointer user_data)
 {
     g_return_if_fail (SIGNON_IS_AUTH_SESSION (self));
-    SignonAuthSessionPrivate* priv = self->priv;
-
-    g_return_if_fail (priv != NULL);
 
     AuthSessionQueryAvailableMechanismsCbData *cb_data = g_slice_new0 (AuthSessionQueryAvailableMechanismsCbData);
     cb_data->self = self;
@@ -589,23 +571,18 @@
 {
     SignonAuthSessionPrivate *priv;
     AuthSessionProcessData *process_data;
-    GSimpleAsyncResult *res;
+    GTask *res;
 
     g_return_if_fail (SIGNON_IS_AUTH_SESSION (self));
     priv = self->priv;
 
     g_return_if_fail (session_data != NULL);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    res = g_simple_async_result_new ((GObject *)self, callback, user_data,
-                                     signon_auth_session_process_async);
-    g_simple_async_result_set_check_cancellable (res, cancellable);
-G_GNUC_END_IGNORE_DEPRECATIONS
+    res = g_task_new (self, cancellable, callback, user_data);
 
     process_data = g_slice_new0 (AuthSessionProcessData);
     process_data->session_data = g_variant_ref_sink (session_data);
     process_data->mechanism = g_strdup (mechanism);
-    process_data->cancellable = cancellable;
     g_object_set_data_full ((GObject *)res, data_key_process, process_data,
                             (GDestroyNotify)auth_session_process_data_free);
 
@@ -636,19 +613,12 @@
 signon_auth_session_process_finish (SignonAuthSession *self, GAsyncResult *res,
                                     GError **error)
 {
-    GSimpleAsyncResult *async_result;
-    GVariant *reply;
+    GTask *task;
 
     g_return_val_if_fail (SIGNON_IS_AUTH_SESSION (self), NULL);
 
-    async_result = (GSimpleAsyncResult *)res;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    if (g_simple_async_result_propagate_error (async_result, error))
-        return NULL;
-
-    reply = g_simple_async_result_get_op_res_gpointer (async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
-    return g_variant_ref (reply);
+    task = G_TASK (res);
+    return g_task_propagate_pointer (task, error);
 }
 
 /**
@@ -748,7 +718,6 @@
     DEBUG ("Object path received: %s", object_path);
     g_free (object_path);
     _signon_object_ready (self, auth_session_object_quark (), error);
-    g_clear_error (&error);
 }
 
 static void
 
=== modified file 'libsignon-glib/signon-dbus-queue.c'
--- libsignon-glib/signon-dbus-queue.c	2010-06-29 07:25:04 +0000
+++ libsignon-glib/signon-dbus-queue.c	2016-05-19 15:30:34 +0000
@@ -121,7 +121,7 @@
 }
 
 void
-_signon_object_ready (gpointer object, GQuark quark, const GError *error)
+_signon_object_ready (gpointer object, GQuark quark, GError *error)
 {
     SignonReadyData *rd;
 
@@ -129,7 +129,7 @@
 
     if(error)
         g_object_set_qdata_full ((GObject *)object, _signon_object_error_quark(),
-                                  g_error_copy(error),
+                                 error,
                                  (GDestroyNotify)g_error_free);
 
     /* steal the qdata so the callbacks won't be invoked again, even if the
 
=== modified file 'libsignon-glib/signon-dbus-queue.h'
--- libsignon-glib/signon-dbus-queue.h	2010-06-28 11:59:12 +0000
+++ libsignon-glib/signon-dbus-queue.h	2016-05-19 15:30:34 +0000
@@ -36,7 +36,7 @@
 void _signon_object_call_when_ready (gpointer object, GQuark quark,
                                     SignonReadyCb callback, gpointer user_data);
 
-void _signon_object_ready (gpointer object, GQuark quark, const GError *error);
+void _signon_object_ready (gpointer object, GQuark quark, GError *error);
 void _signon_object_not_ready (gpointer object);
 
 const GError *_signon_object_last_error (gpointer object);
 
=== modified file 'libsignon-glib/signon-errors.h'
--- libsignon-glib/signon-errors.h	2012-01-27 10:24:27 +0000
+++ libsignon-glib/signon-errors.h	2016-05-19 15:30:34 +0000
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "signon-enum-types.h"
+#include <libsignon-glib/signon-enum-types.h>
 
 #define SIGNON_ERROR (signon_error_quark())
 
 
=== modified file 'libsignon-glib/signon-identity-info.c'
--- libsignon-glib/signon-identity-info.c	2015-04-02 13:23:18 +0000
+++ libsignon-glib/signon-identity-info.c	2016-05-19 15:30:34 +0000
@@ -144,6 +144,7 @@
         {
             g_hash_table_insert (info->methods, method, mechanisms);
         }
+        g_variant_unref (method_map);
     }
 
     g_variant_lookup (variant,
 
=== modified file 'libsignon-glib/signon-identity.c'
--- libsignon-glib/signon-identity.c	2015-04-02 13:23:18 +0000
+++ libsignon-glib/signon-identity.c	2016-05-19 15:30:34 +0000
@@ -949,9 +949,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     DEBUG ("%s %d", G_STRFUNC, __LINE__);
 
     IdentityVerifyCbData *cb_data = g_slice_new0 (IdentityVerifyCbData);
@@ -1202,7 +1199,7 @@
         }
     }
 
-    if (priv->updated == TRUE)
+    if (priv->updated || priv->removed)
         g_slice_free (IdentityInfoCbData, cb_data);
 
     g_slice_free (IdentityVoidData, operation_data);
@@ -1308,9 +1305,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     DEBUG ("%s %d", G_STRFUNC, __LINE__);
 
     IdentityVoidData *operation_data = g_slice_new0 (IdentityVoidData);
@@ -1335,9 +1329,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     IdentityVoidCbData *cb_data = g_slice_new0 (IdentityVoidCbData);
     cb_data->self = self;
     cb_data->cb = (SignonIdentityVoidCb)cb;
@@ -1368,9 +1359,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     IdentityVoidCbData *cb_data = g_slice_new0 (IdentityVoidCbData);
     cb_data->self = self;
     cb_data->cb = (SignonIdentityVoidCb)cb;
@@ -1399,9 +1387,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     //TODO implement
 
     if (cb)
@@ -1424,9 +1409,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     //TODO implement
 
     if (cb)
@@ -1448,9 +1430,6 @@
 {
     g_return_if_fail (SIGNON_IS_IDENTITY (self));
 
-    SignonIdentityPrivate *priv = self->priv;
-    g_return_if_fail (priv != NULL);
-
     IdentityInfoCbData *cb_data = g_slice_new0 (IdentityInfoCbData);
     cb_data->self = self;
     cb_data->cb = cb;
 
=== modified file 'libsignon-glib/signon-utils.c'
--- libsignon-glib/signon-utils.c	2012-10-17 07:06:24 +0000
+++ libsignon-glib/signon-utils.c	2016-05-19 15:30:34 +0000
@@ -106,7 +106,7 @@
 
         if (G_VALUE_TYPE (value) == G_TYPE_VARIANT)
         {
-            val = g_value_get_variant (value);
+            val = g_value_dup_variant (value);
         }
         else
         {
@@ -115,6 +115,7 @@
             val = g_dbus_gvalue_to_gvariant (value, type);
         }
         g_variant_builder_add (&builder, "{sv}", key, val);
+        g_variant_unref (val);
     }
     return g_variant_builder_end (&builder);
 }
 
=== modified file 'libsignon-glib/sso-auth-service.c'
--- libsignon-glib/sso-auth-service.c	2012-08-02 10:25:45 +0000
+++ libsignon-glib/sso-auth-service.c	2016-05-19 15:30:34 +0000
@@ -51,6 +51,13 @@
 }
 
 static void
+weak_ref_free(GWeakRef *ref)
+{
+    g_weak_ref_clear (ref);
+    g_slice_free (GWeakRef, ref);
+}
+
+static void
 set_singleton (SsoAuthService *object)
 {
     g_return_if_fail (IS_SSO_AUTH_SERVICE (object));
@@ -59,7 +66,8 @@
 
     if (thread_objects == NULL)
     {
-        thread_objects = g_hash_table_new (g_direct_hash, g_direct_equal);
+        thread_objects = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                                NULL, (GDestroyNotify) weak_ref_free);
     }
 
     if (object != NULL)
 
=== added file 'm4/gcov.m4'
--- m4/gcov.m4	1970-01-01 00:00:00 +0000
+++ m4/gcov.m4	2016-05-19 15:30:34 +0000
@@ -0,0 +1,92 @@
+# Copyright 2012-2016 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Checks for existence of coverage tools:
+#  * gcov
+#  * lcov
+#  * genhtml
+#  * gcovr
+# 
+# Sets ac_cv_check_gcov to yes if tooling is present
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+AC_DEFUN([AC_TDD_GCOV],
+[
+  AC_ARG_ENABLE(gcov,
+  AS_HELP_STRING([--enable-gcov],
+		 [enable coverage testing with gcov]))
+
+  AM_CONDITIONAL(HAVE_GCOV, test "x$enable_gcov" = "xyes")
+
+  if test "x$enable_gcov" = "xyes"; then
+  # we need gcc:
+  if test "$GCC" != "yes"; then
+    AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+
+  # Check if ccache is being used
+  AC_CHECK_PROG(SHTOOL, shtool, shtool)
+  if test "$SHTOOL"; then
+    AS_CASE([`$SHTOOL path $CC`],
+                [*ccache*], [gcc_ccache=yes],
+                [gcc_ccache=no])
+  fi
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
+  fi
+
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12"
+  AC_CHECK_PROG(LCOV, lcov, lcov)
+  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
+
+  if test "$LCOV"; then
+    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
+      glib_cv_lcov_version=invalid
+      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+      for lcov_check_version in $lcov_version_list; do
+        if test "$lcov_version" = "$lcov_check_version"; then
+          glib_cv_lcov_version="$lcov_check_version (ok)"
+        fi
+      done
+    ])
+  else
+    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+    AC_MSG_ERROR([$lcov_msg])
+  fi
+
+  case $glib_cv_lcov_version in
+    ""|invalid[)]
+      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+      AC_MSG_ERROR([$lcov_msg])
+      LCOV="exit 0;"
+      ;;
+  esac
+
+  if test -z "$GENHTML"; then
+    AC_MSG_ERROR([Could not find genhtml from the lcov package])
+  fi
+
+  # Remove all optimization flags from CFLAGS
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+
+  # Add the special gcc flags
+  COVERAGE_CFLAGS="--coverage -DG_DISABLE_ASSERTS -DG_DISABLE_CHECKS"
+  COVERAGE_CXXFLAGS="--coverage"	
+  COVERAGE_LDFLAGS="-lgcov"
+
+fi
+]) # AC_TDD_GCOV
+
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2014-12-09 09:20:01 +0000
+++ tests/Makefile.am	2016-05-19 15:30:34 +0000
@@ -5,6 +5,7 @@
 
 signon_glib_testsuite_SOURCES = check_signon.c
 signon_glib_testsuite_CPPFLAGS = \
+	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	$(DEPS_CFLAGS) \
 	$(CHECK_FLAGS)
@@ -14,4 +15,7 @@
 	$(DEPS_LIBS) \
 	-lpthread
 
+TESTS_ENVIRONMENT = \
+	TESTDIR=$(top_srcdir)/tests/; export TESTDIR;
+
 TESTS = signon-glib-test.sh
 
=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2015-04-20 11:32:46 +0000
+++ tests/check_signon.c	2016-05-19 15:30:34 +0000
@@ -309,6 +309,7 @@
     g_main_loop_run (main_loop);
 
     g_free(patterns[0]);
+    g_object_unref(auth_session);
     g_object_unref(idty);
 
     end_test ();
@@ -366,6 +367,7 @@
     g_free(patterns[0]);
     g_free(patterns[1]);
     g_free(patterns[2]);
+    g_object_unref(auth_session);
     g_object_unref(idty);
 
     end_test ();
@@ -406,8 +408,6 @@
     fail_unless(g_strcmp0(g_value_get_string(usernameVa), "test_username") == 0, "Wrong value of username");
     fail_unless(g_strcmp0(g_value_get_string(realmVa), "testRealm_after_test") == 0, "Wrong value of realm");
 
-    g_hash_table_destroy(sessionData);
-
     g_free(usernameKey);
     g_free(realmKey);
 
@@ -528,6 +528,88 @@
     g_free(passwordVa);
     g_free(passwordKey);
 
+    g_hash_table_unref (sessionData);
+
+    end_test ();
+}
+END_TEST
+
+static void
+test_auth_session_process_async_cb (GObject *source_object,
+                                    GAsyncResult *res,
+                                    gpointer user_data)
+{
+    SignonAuthSession *auth_session = SIGNON_AUTH_SESSION (source_object);
+    GVariant **v_reply = user_data;
+    GError *error = NULL;
+
+    fail_unless (SIGNON_IS_AUTH_SESSION (source_object));
+
+    *v_reply = signon_auth_session_process_finish (auth_session, res, &error);
+    fail_unless (error == NULL);
+
+    g_main_loop_quit (main_loop);
+}
+
+START_TEST(test_auth_session_process_async)
+{
+    gint state_counter = 0;
+    GError *err = NULL;
+    GVariantBuilder builder;
+    GVariant *session_data, *reply;
+    gchar *username, *realm;
+    gboolean ok;
+
+    g_debug("%s", G_STRFUNC);
+    SignonIdentity *idty = signon_identity_new(NULL, NULL);
+    fail_unless (idty != NULL, "Cannot create Iddentity object");
+
+    SignonAuthSession *auth_session = signon_identity_create_session(idty,
+                                                                     "ssotest",
+                                                                     &err);
+
+    fail_unless (auth_session != NULL, "Cannot create AuthSession object");
+
+    g_clear_error(&err);
+
+    g_signal_connect(auth_session, "state-changed",
+                     G_CALLBACK(test_auth_session_states_cb), &state_counter);
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add (&builder, "{sv}",
+                           SIGNON_SESSION_DATA_USERNAME,
+                           g_variant_new_string ("test_username"));
+    g_variant_builder_add (&builder, "{sv}",
+                           SIGNON_SESSION_DATA_SECRET,
+                           g_variant_new_string ("test_pw"));
+
+    session_data = g_variant_builder_end (&builder);
+
+    signon_auth_session_process_async (auth_session,
+                                       session_data,
+                                       "mech1",
+                                       NULL,
+                                       test_auth_session_process_async_cb,
+                                       &reply);
+    main_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (main_loop);
+    fail_unless (state_counter == 12, "Wrong numer of state change signals: %d", state_counter);
+
+    fail_unless (reply != NULL);
+    session_data = NULL;
+
+    ok = g_variant_lookup (reply, SIGNON_SESSION_DATA_USERNAME, "&s", &username);
+    ck_assert (ok);
+    ck_assert_str_eq (username, "test_username");
+    ok = g_variant_lookup (reply, SIGNON_SESSION_DATA_REALM, "&s", &realm);
+    ck_assert (ok);
+    ck_assert_str_eq (realm, "testRealm_after_test");
+
+    g_variant_unref (reply);
+
+    g_object_unref (auth_session);
+    g_object_unref (idty);
+
     end_test ();
 }
 END_TEST
@@ -581,6 +663,7 @@
     fail_unless (error->domain == SIGNON_ERROR);
     fail_unless (error->code == SIGNON_ERROR_METHOD_NOT_KNOWN);
 
+    g_error_free (error);
     g_object_unref (auth_session);
 
     end_test ();
@@ -610,7 +693,6 @@
     fail_unless (g_strcmp0 (g_value_get_string (v_username), "Nice user") == 0,
                  "Wrong value of username");
 
-    g_hash_table_unref (reply);
     g_object_unref (self);
 
     g_main_loop_quit (main_loop);
@@ -654,6 +736,7 @@
                                  "mech1",
                                  test_auth_session_process_after_store_cb,
                                  NULL);
+    g_hash_table_unref (session_data);
 }
 
 START_TEST(test_auth_session_process_after_store)
@@ -681,6 +764,7 @@
     g_main_loop_run (main_loop);
 
     g_object_unref (identity);
+    signon_identity_info_free (info);
 
     end_test ();
 }
@@ -722,6 +806,7 @@
 
     *new_id = id;
 
+    g_object_unref (self);
     g_main_loop_quit (main_loop);
 }
 
@@ -1064,7 +1149,7 @@
          fail_unless (_contains(mechs3, "mechanism3"));
      }
 
-     if (info)
+     if (info && pattern_ptr)
      {
          signon_identity_info_free (pattern);
          *pattern_ptr = signon_identity_info_copy (info);
@@ -1309,6 +1394,7 @@
     signon_identity_query_info (idty, identity_info_cb, &info);
     g_main_loop_run (main_loop);
 
+    signon_identity_info_free (info);
     g_object_unref (idty);
     g_object_unref (idty2);
 
@@ -1425,6 +1511,7 @@
                                  "mech1",
                                  test_regression_unref_process_cb,
                                  "Hi there!");
+    g_hash_table_unref (session_data);
     g_main_loop_run (main_loop);
 
     end_test ();
@@ -1453,6 +1540,7 @@
     tcase_add_test (tc_core, test_auth_session_query_mechanisms);
     tcase_add_test (tc_core, test_auth_session_query_mechanisms_nonexisting);
     tcase_add_test (tc_core, test_auth_session_process);
+    tcase_add_test (tc_core, test_auth_session_process_async);
     tcase_add_test (tc_core, test_auth_session_process_failure);
     tcase_add_test (tc_core, test_auth_session_process_after_store);
     tcase_add_test (tc_core, test_store_credentials_identity);
 
=== added file 'tests/signon-glib-test-wrapper.sh'
--- tests/signon-glib-test-wrapper.sh	1970-01-01 00:00:00 +0000
+++ tests/signon-glib-test-wrapper.sh	2016-05-19 15:30:34 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec "$(pwd)/../libtool" --mode=execute $WRAPPER ./signon-glib-testsuite
 
=== modified file 'tests/signon-glib-test.sh'
--- tests/signon-glib-test.sh	2015-04-10 07:27:34 +0000
+++ tests/signon-glib-test.sh	2016-05-19 15:30:34 +0000
@@ -10,9 +10,16 @@
 
 #Environment variables for the test application
 export G_MESSAGES_DEBUG=all
-export G_SLICE=debug-blocks
+# If running the test executable under a wrapper, setup the tests so that the
+# wrapper can debug them more easily.
+if [ -n "$WRAPPER" ]; then
+    export G_SLICE=always-malloc
+    export CK_FORK="no"
+else
+    export G_SLICE=debug-blocks
+fi
 
-TEST_APP=./signon-glib-testsuite
+TEST_APP="$TESTDIR/signon-glib-test-wrapper.sh"
 
 # If dbus-test-runner exists, use it to run the tests in a separate D-Bus
 # session