Merge lp:~alextu/savilerow/test_custom_sound into lp:~ethan.chang/savilerow/test_custom_sound

[Alex Tu]

Modified the latest test case to check the synchronization between dconf and AccountsService by D-Bus interface.

[Ethan Chang (ethan.chang)]

Tested the script on the N4, the script works well.

[Ethan Chang (ethan.chang)]

LGTM

review: Approve

=== modified file 'tests/api/test_custom_sound.py'
--- tests/api/test_custom_sound.py	2014-08-11 09:46:56 +0000
+++ tests/api/test_custom_sound.py	2014-08-13 03:15:14 +0000
@@ -1,5 +1,6 @@
 from autopilot.testcase import AutopilotTestCase
 import os
+import dbus
 from gi.repository import Gio
 
 #: Custom Ringtones/Notifications
@@ -36,11 +37,31 @@
 
     def test_custom_sounds_running(self):
         """
-        This test ensures that the custom ringtone and notification have been set as default
-        sounds
+        This test ensures that the custom ringtone and notification which set in dconf database 
+        have been synced picked by AccountsService dbus object. 
         """
         settings = Gio.Settings('com.ubuntu.touch.sound')
-        default_ringtone = settings.get_string('incoming-call-sound')
-        default_notification = settings.get_string('incoming-message-sound')
-        self.assertTrue(ringtone in default_ringtone,notification in default_notification) 
+        dconf_ringtone = settings.get_string('incoming-call-sound')
+        dconf_notification = settings.get_string('incoming-message-sound')
+        
+        # get the setting in dbus object.
+        system_bus = dbus.SystemBus()
+        manager_proxy = system_bus.get_object('org.freedesktop.Accounts',
+                                              '/org/freedesktop/Accounts')
+        object_path = manager_proxy.FindUserById(
+            os.getuid(), dbus_interface='org.freedesktop.Accounts'
+        )
+        user_proxy = system_bus.get_object('org.freedesktop.Accounts', object_path)
+
+        try:
+            notification = user_proxy.Get('com.ubuntu.touch.AccountsService.Sound', 'IncomingCallSound',
+                dbus_interface=dbus.PROPERTIES_IFACE)
+            ringtone = user_proxy.Get('com.ubuntu.touch.AccountsService.Sound', 'IncomingMessageSound',
+                dbus_interface=dbus.PROPERTIES_IFACE)
+
+        except dbus.exceptions.DBusException as e:
+            print("Couldn't get %s: %s" % (setting, e), file=sys.stderr)
+
+
+        self.assertTrue((ringtone in dconf_ringtone and notification in dconf_notification), "value does not sync between dconf and the one from DBus")