Merge lp:~nataliabidart/ubuntu/natty/ubuntu-sso-client/ubuntu-sso-client-1.2.1 into lp:ubuntu/natty/ubuntu-sso-client

[Natalia Bidart]

  * New upstream release:
  [ Alejandro J. Cura <email address hidden> ]
    - A new value was added the Secret DBus struct (LP: #734671).

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-03-30 20:39:37 +0000
+++ PKG-INFO	2011-04-12 16:50:55 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 1.2.0
+Version: 1.2.1
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-31 16:08:45 +0000
+++ debian/changelog	2011-04-12 16:50:55 +0000
@@ -1,3 +1,12 @@
+ubuntu-sso-client (1.2.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Alejandro J. Cura <[e-mail]> ]
+    - A new value was added the Secret DBus struct (LP: #734671).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 12 Apr 2011 13:43:24 -0300
+
 ubuntu-sso-client (1.2.0-0ubuntu1) natty; urgency=low
 
   * New upstream release:

=== modified file 'pylintrc'
--- pylintrc	2010-10-11 13:22:16 +0000
+++ pylintrc	2011-04-12 16:50:55 +0000
@@ -50,7 +50,8 @@
 # W0142: Used * or ** magic
 # W0613: Unused argument 'yyy'
 # C0302: Too many lines in module
-disable=R,I,W0142,W0613,C0302
+# W0404: Reimport of module
+disable=R,I,W0142,W0613,C0302,W0404
 
 
 [REPORTS]

=== modified file 'setup.py'
--- setup.py	2011-03-30 20:39:37 +0000
+++ setup.py	2011-04-12 16:50:55 +0000
@@ -86,7 +86,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='1.2.0',
+    version='1.2.1',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/utils/tests/test_txsecrets.py'
--- ubuntu_sso/utils/tests/test_txsecrets.py	2011-02-03 15:46:51 +0000
+++ ubuntu_sso/utils/tests/test_txsecrets.py	2011-04-12 16:50:55 +0000
@@ -40,6 +40,7 @@
 PROMPT_BASE_PATH = "/org/freedesktop/secrets/prompt"
 SESSION_BASE_PATH = "/org/freedesktop/secrets/session"
 COLLECTION_BASE_PATH = "/org/freedesktop/secrets/collection/"
+SAMPLE_CONTENT_TYPE = "text/plain; charset=utf8"
 
 
 class SampleMiscException(Exception):
@@ -95,6 +96,18 @@
         return True
 
 
+class AltItemMock(ItemMock):
+    """The secret in this item has a content_type."""
+
+    @dbus.service.method(dbus_interface=txsecrets.ITEM_IFACE,
+                         in_signature="o", out_signature="(oayays)")
+    def GetSecret(self, session):
+        """Retrieve the secret for this item."""
+        if self.get_secret_fail:
+            raise SampleMiscException()
+        return (session, "", self.value, SAMPLE_CONTENT_TYPE)
+
+
 class PromptMock(dbus.service.Object):
     """A prompt necessary to complete an operation."""
 
@@ -126,6 +139,7 @@
     create_item_fail = False
     locked = False
     unlock_prompts = False
+    item_mock_class = ItemMock
 
     def __init__(self, label, *args, **kwargs):
         """Initialize this instance."""
@@ -150,8 +164,8 @@
         item_label = properties[txsecrets.LABEL_PROPERTY]
         session, parameters, value = secret
         item_path = create_object_path(make_coll_path(self.label))
-        item = self.dbus_publish(item_path, ItemMock, self, item_label,
-                                 attributes, value)
+        item = self.dbus_publish(item_path, self.item_mock_class, self,
+                                 item_label, attributes, value)
         self.items.append(item)
         if self.create_item_prompt:
             prompt_path = create_object_path(PROMPT_BASE_PATH)
@@ -746,6 +760,22 @@
         self.assertEqual(value, sample_secret)
 
     @inlineCallbacks
+    def test_get_value_four_items_per_secret(self):
+        """The code works fine when the secret dbus struct has 4 items."""
+        yield self.secretservice.open_session()
+        collection_label = "sample_keyring"
+        coll = yield self.create_sample_collection(collection_label)
+        mock_coll = self.mock_service.collections[collection_label]
+        mock_coll.item_mock_class = AltItemMock
+        attr = {"key-type": "Ubuntu SSO credentials"}
+        sample_secret = "secret83!"
+        yield coll.create_item("Cucaracha", attr, sample_secret)
+        items = yield self.secretservice.search_items(attr)
+        self.assertEqual(len(items), 1)
+        value = yield items[0].get_value()
+        self.assertEqual(value, sample_secret)
+
+    @inlineCallbacks
     def test_get_value_throws_dbus_error(self):
         """The secret value is not retrieved if DBus fails."""
         yield self.secretservice.open_session()

=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2011-02-03 15:46:51 +0000
+++ ubuntu_sso/utils/txsecrets.py	2011-04-12 16:50:55 +0000
@@ -316,7 +316,7 @@
         def getsecret_handler(secret):
             """The secret for this item was found."""
             # pylint: disable=W0612
-            session, parameters, value = secret
+            value = secret[2]
             d.callback(value)
 
         self.item_iface.GetSecret(self.service.session, byte_arrays=True,