summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2022-07-24 20:18:49 +0200
committerRay Strode <rstrode@redhat.com>2022-07-26 12:52:24 -0400
commitd1bdde95aab7bab193f06a0a1b9d0ac418772566 (patch)
tree91158be0aa7e162a3a1fa8844ef46c0ff570ea10
parenteeaa2d041ae64c51164e03a9335d8dcc28bf7c50 (diff)
downloadaccountsservice-d1bdde95aab7bab193f06a0a1b9d0ac418772566.tar.gz
tests: Fix tests for 2nd user
-rwxr-xr-xtests/test-daemon.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test-daemon.py b/tests/test-daemon.py
index 08ebfc1..1b08bf8 100755
--- a/tests/test-daemon.py
+++ b/tests/test-daemon.py
@@ -285,16 +285,16 @@ class Tests(dbusmock.DBusTestCase):
user_proxy.call_sync('SetLanguages', GLib.Variant('(as)', (['fr_FR.UTF-8', 'en_GB.UTF-8'],)), 0, -1, None)
self.assertEqual(self.get_user_dbus_property(user, 'Language'), 'fr_FR.UTF-8')
self.assertEqual(self.get_user_dbus_property(user, 'Languages'), ['fr_FR.UTF-8', 'en_GB.UTF-8'])
- self.assertEqual(self.proxy.GetUsersLanguages(), ['en_GB.UTF-8', 'fr_FR.UTF-8', SIMULATED_SYSTEM_LOCALE])
+ self.assertEqual(self.proxy.GetUsersLanguages(), ['en_GB.UTF-8', SIMULATED_SYSTEM_LOCALE, 'fr_FR.UTF-8'])
user_proxy.call_sync('SetLanguage', GLib.Variant('(s)', ('en_US.UTF-8',)), 0, -1, None)
self.assertEqual(self.get_user_dbus_property(user, 'Language'), 'en_US.UTF-8')
self.assertEqual(self.get_user_dbus_property(user, 'Languages'), ['en_US.UTF-8'])
- self.assertEqual(self.proxy.GetUsersLanguages(), ['en_US.UTF-8', SIMULATED_SYSTEM_LOCALE])
+ self.assertEqual(self.proxy.GetUsersLanguages(), [SIMULATED_SYSTEM_LOCALE, 'en_US.UTF-8'])
user_proxy.call_sync('SetLanguages', GLib.Variant('(as)', (['fr_FR.UTF-8', 'en_GB.UTF-8'],)), 0, -1, None)
self.assertEqual(self.get_user_dbus_property(user, 'Languages'), ['fr_FR.UTF-8', 'en_GB.UTF-8'])
- self.assertEqual(self.proxy.GetUsersLanguages(), ['en_GB.UTF-8', 'fr_FR.UTF-8', SIMULATED_SYSTEM_LOCALE])
+ self.assertEqual(self.proxy.GetUsersLanguages(), ['en_GB.UTF-8', SIMULATED_SYSTEM_LOCALE, 'fr_FR.UTF-8'])
user_proxy.call_sync('SetLanguages', GLib.Variant('(as)', ([''],)), 0, -1, None)
self.assertEqual(self.get_user_dbus_property(user, 'Language'), '')
@@ -311,7 +311,7 @@ class Tests(dbusmock.DBusTestCase):
self.start_daemon()
res = self.proxy.call_sync('ListCachedUsers', GLib.Variant('()', ()), 0, -1, None)
- user = res[0][0]
+ user = res[0][1]
user_proxy = Gio.DBusProxy.new_sync(
self.dbus, Gio.DBusProxyFlags.DO_NOT_AUTO_START, None, AD,
@@ -332,7 +332,7 @@ class Tests(dbusmock.DBusTestCase):
res = self.proxy.call_sync('ListCachedUsers', GLib.Variant('()', ()), 0, -1, None)
self.assertIsNotNone(res)
- user = res[0][0]
+ user = res[0][1]
self.assertEqual(user, AD_USER_PATH + '1001')
self.assertEqual(self.get_user_dbus_property(user, 'IconFile'), self.test_dir + '/var/lib/AccountsService/icons/rupert')