Merge lp:~jamesh/storage-framework/fix-fake-oa into lp:storage-framework/devel

[James Henstridge]

Update fake-online-accounts-daemon.py to work with online-accounts-api 0.1+17.04.20161110-0ubuntu1

Update fake-online-accounts-daemon.py to work with online-accounts-api 0.1+17.04.20161110-0ubuntu1

[lp:~jamesh/storage-framework/fix-fake-oa]

94. By James Henstridge on 2016-11-16

Remove copy of online accounts introspection XML.

[Michi Henning (michihenning)]

Looks good, thanks!

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:93
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/202/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1083
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1090
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/880/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/880/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/880/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/880/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/880/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/880
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/880/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/202/rebuild

review: Approve (continuous-integration)

=== removed file 'tests/utils/com.ubuntu.OnlineAccounts.Manager.xml'
--- tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	2016-07-12 02:25:26 +0000
+++ tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
-<node name="/com/ubuntu/OnlineAccounts/Manager">
-  <interface name="com.ubuntu.OnlineAccounts.Manager">
-
-    <!--
-      Global concepts:
-
-      Clients are identified by their "applicationId", which is the
-      "<package>_<app>" of the client.
-
-      The "serviceId" is an application-specific name for an account provider.
-      That is, the "serviceId" contains the information about the application
-      which will use it, and the account provider (e.g. "google", "facebook").
-      "serviceId"s are backed by files shipped with the application, which can
-      contain application/account-provider specific information, such as the
-      ClientId and ClientSecret to be used when authentication with OAuth 2.0. 
-      An application can ship more than one "serviceId", if they refer to
-      different account providers; that is, one application can have a
-      serviceId for Google and one for Facebook, but the same application
-      cannot have one for GMail and another for Picasa.
-    -->
-
-    <!--
-      GetAccounts: returns a list of account IDs that satisfy the given
-      filters.
-
-      Allowed keys for the "filters" parameter (any combination is allowed,
-      though not all combinations might make sense):
-
-      - "applicationId" ("s"): the "<package>_<app>" of the client. An
-        unconfined application can specify this in order to restrict the set
-        of results to only those accounts that the application has been
-        authorized to use. For confined apps, OA will deduce the
-        applicationId from the apparmor label of the caller.
-
-      - "serviceId" ("s"): if the application wants to list only those
-        accounts coming from a specific provider (e.g., "Facebook").
-
-      - "accountId" ("u"): the ID of an account.
-
-      In any case, an application will receive only those accounts which the
-      user has authorized the application to use. See
-        http://wiki.ubuntu.com/OnlineAccounts
-      for an overview of the UI experience.
-
-      Disabled accounts will not be returned.
-    -->
-    <method name="GetAccounts">
-      <arg name="filters" type="a{sv}" direction="in" />
-      <!--
-        The return value is a list of account IDs paired with a dictionary of account data.
-        This will always include:
-        - "serviceId" (s)
-        - "displayName" (s)
-        Other settings stored on the account will also be included, such as the
-        server address and port of an owncloud or IMAP account, but we haven't
-        defined exactly how. Possibly, all account-specific keys will be
-        prefixed by "settings/", in order not to clash with the keys defined at
-        the framework level.
-      -->
-      <arg name="accounts" type="a(ua{sv})" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0"
-                  value="QList&lt;AccountInfo&gt;"/>
-    </method>
-
-    <!--
-      Authenticate: request authentication credentials for the given
-      account ID in the context of a particular service.
-
-      If "interactive" is false, an error will be returned if
-      user interaction would be required to retrieve the
-      credentials.
-
-      If "invalidate" is true, any stored credentials will be
-      ignored and new credentials will be requested from the account
-      provider.
-    -->
-    <method name="Authenticate">
-      <arg name="accountId" type="u" direction="in" />
-      <arg name="serviceId" type="s" direction="in" />
-      <arg name="interactive" type="b" direction="in" />
-      <arg name="invalidate" type="b" direction="in" />
-      <!--
-        This dictionary can be used to specify OAuth client keys or permission
-        scopes. While it's possible to statically define them a the "serviceId"
-        level, some apps might want to change this information at runtime.
-        Possible use cases:
-        1) OAuth keys are retrieved from a server (so that they can be updated
-           when the old ones are revoked).
-        2) An app might want to use different keys when talking to GMail and
-           Picasa.
-        3) The scope list can also be dynamic, and depending on how the user is
-           using the app.
-        4) SASL: the parameters would contain the latest challenge got from the
-           server.
-      --> 
-      <arg name="parameters" type="a{sv}" direction="in" />
-      <arg name="credentials" type="a{sv}" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-    </method>
-
-    <!--
-      RequestAccess: register a new account for use with the given
-      service.
-      This method also performs the authentication, since that's what apps
-      would do as soon as they get the account.
-    -->
-    <method name="RequestAccess">
-      <arg name="serviceId" type="s" direction="in" />
-      <arg name="parameters" type="a{sv}" direction="in" />
-      <arg name="account" type="(ua{sv})" direction="out" />
-      <arg name="credentials" type="a{sv}" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="AccountInfo"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
-    </method>
-
-    <!--
-      AccountChanged: emitted when account details are changed.
-
-      The apparmor policy will NOT ALLOW confined applications to receive
-      this signal on the account manager object path (which might be
-      /com/ubuntu/OnlineAccounts/Manager). Only unconfined applications will
-      be able to listen to this signal from that object path.
-
-      Confined apps will have to catch this signal from a different object path:
-      /com/ubuntu/OnlineAccounts/Manager/@{APP_PKGNAME_DBUS}, which will
-      deliver the signal only for those accounts which the app has been
-      authorized to use.
-    -->
-    <signal name="AccountChanged">
-      <!--
-        The serviceId will also be included in the "account" dictionary. The
-        reason for having it also here is to allow clients to filter D-Bus
-        messages by arg0. This can be important for unconfined clients, which
-        would otherwise be woken up by any account change, even those not
-          relevant to them.
-      -->
-      <arg name="serviceId" type="s" />
-      <!--
-        The dictionary contains a changeType key, type "u", whose value is
-        enum { enabled, disabled, changed }
-      -->
-      <arg name="account" type="(ua{sv})" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="AccountInfo"/>
-    </signal>
-
-  </interface>
-</node>

=== modified file 'tests/utils/fake-online-accounts-daemon.py'
--- tests/utils/fake-online-accounts-daemon.py	2016-11-01 03:36:29 +0000
+++ tests/utils/fake-online-accounts-daemon.py	2016-11-16 06:09:36 +0000
@@ -17,7 +17,6 @@
 
 """A fake version of the OnlineAccounts D-Bus service."""
 
-import os
 import sys
 
 import dbus.service
@@ -28,9 +27,6 @@
 OBJECT_PATH = "/com/ubuntu/OnlineAccounts/Manager"
 OA_IFACE = "com.ubuntu.OnlineAccounts.Manager"
 
-INTERFACE_XML = os.path.join(os.path.dirname(__file__),
-                             "com.ubuntu.OnlineAccounts.Manager.xml")
-
 AUTH_OAUTH1 = 1
 AUTH_OAUTH2 = 2
 AUTH_PASSWORD = 3
@@ -114,12 +110,12 @@
         self.accounts = accounts
 
     @dbus.service.method(dbus_interface=OA_IFACE,
-                         in_signature="a{sv}", out_signature="a(ua{sv})")
+                         in_signature="a{sv}", out_signature="a(ua{sv})aa{sv}")
     def GetAccounts(self, filters):
         #print("GetAccounts %r" % filters)
         sys.stdout.flush()
         return dbus.Array([a.serialise() for a in self.accounts],
-                          signature="a(ua{sv})")
+                          signature="a(ua{sv})"), dbus.Array(signature="a{sv}")
 
     @dbus.service.method(dbus_interface=OA_IFACE,
                          in_signature="usbba{sv}", out_signature="a{sv}")