[arch-commits] Commit in accountsservice/trunk (PKGBUILD fix-tests.diff)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 16:54:01
  Author: heftig
Revision: 441274

22.08.8-2: debug on

Added:
  accountsservice/trunk/fix-tests.diff
Modified:
  accountsservice/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++++---
 fix-tests.diff |   16 ++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 15:19:50 UTC (rev 441273)
+++ PKGBUILD	2022-04-02 16:54:01 UTC (rev 441274)
@@ -3,7 +3,7 @@
 
 pkgname=accountsservice
 pkgver=22.08.8
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus interface for user account query and manipulation"
 url="https://gitlab.freedesktop.org/accountsservice/accountsservice"
 arch=(x86_64)
@@ -11,9 +11,12 @@
 depends=(glib2 polkit systemd shadow libxcrypt)
 makedepends=(gtk-doc gobject-introspection git meson docbook-xsl xmlto vala)
 checkdepends=(python-gobject python-dbusmock)
+options=(debug)
 _commit=1ef3add46983af875adfed5d29954cbfb184f688  # tags/22.08.8^0
-source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit"
+        fix-tests.diff)
+sha256sums=('SKIP'
+            '2da027faae5e477ed9ff57e3fc3cb8cd607073835118a05dd7b86bb7ff7c47fd')
 
 pkgver() {
   cd $pkgname
@@ -23,6 +26,9 @@
 
 prepare() {
   cd $pkgname
+
+  # Tests are broken: https://github.com/martinpitt/python-dbusmock/issues/118
+  git apply -3 ../fix-tests.diff
 }
 
 build() {

Added: fix-tests.diff
===================================================================
--- fix-tests.diff	                        (rev 0)
+++ fix-tests.diff	2022-04-02 16:54:01 UTC (rev 441274)
@@ -0,0 +1,16 @@
+diff --git i/tests/dbusmock/accounts_service.py w/tests/dbusmock/accounts_service.py
+index 81692b2..eabe12c 100644
+--- i/tests/dbusmock/accounts_service.py
++++ w/tests/dbusmock/accounts_service.py
+@@ -170,8 +170,9 @@ def CreateUser(self, name, fullname, account_type):
+ 
+     self.users_auto_uids += 1
+ 
+-    return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD, {
+-        'RealName': fullname, 'AccountType': account_type})
++    return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD,
++        dbus.Dictionary({'RealName': fullname, 'AccountType': account_type},
++            signature='sv'))
+ 
+ 
+ @dbus.service.method(MAIN_IFACE, in_signature='xb')