Merge lp:~dobey/ubuntu-sso-client/fix-805244 into lp:ubuntu-sso-client

[dobey]

Support the new API signature for CreateCollection as well

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'ubuntu_sso/utils/tests/test_txsecrets.py'
--- ubuntu_sso/utils/tests/test_txsecrets.py	2011-06-23 17:50:51 +0000
+++ ubuntu_sso/utils/tests/test_txsecrets.py	2011-07-05 15:31:33 +0000
@@ -371,6 +371,17 @@
     clxn_label_property = txsecrets.CLXN_LABEL_PROPERTY
     collections_property = txsecrets.COLLECTIONS_PROPERTY
 
+    # pylint: disable=W0221
+    @dbus.service.method(dbus_interface=txsecrets.SERVICE_IFACE,
+                         in_signature="a{sv}s", out_signature="oo")
+    def CreateCollection(self, properties, alias):
+        """Create a new collection with the specified properties."""
+        collection, prompt = super(AltSecretServiceMock,
+                                   self).CreateCollection(properties)
+        self.SetAlias(alias, collection)
+        return collection, prompt
+    # pylint: enable=W0221
+
 
 def create_object_path(base):
     """Create a random object path given a base path."""

=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2011-06-23 13:43:39 +0000
+++ ubuntu_sso/utils/txsecrets.py	2011-07-05 15:31:33 +0000
@@ -157,7 +157,7 @@
         d.addCallback(self.make_item_list)
         return d
 
-    def create_collection(self, label):
+    def create_collection(self, label, alias=''):
         """Create a new collection with the specified properties."""
         d = Deferred()
 
@@ -180,9 +180,13 @@
 
         properties = {CLXN_LABEL_PROPERTY: dbus.String(label,
                                                        variant_level=1)}
-        self.service.CreateCollection(properties,
-                                      reply_handler=createcollection_handler,
-                                      error_handler=error_fallback)
+        try:
+            self.service.CreateCollection(
+                properties, alias,
+                reply_handler=createcollection_handler,
+                error_handler=error_fallback)
+        except TypeError:
+            error_fallback(None)
 
         d.addCallback(lambda p: Collection(self, p))
         return d