OSDN Git Service

test: Fix pbap-client to handle PullAll reply properly
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Mon, 17 Dec 2012 13:25:27 +0000 (15:25 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 17 Dec 2012 14:32:02 +0000 (16:32 +0200)
PullAll reply consist in 2 parameters, the transfer object followed by
its properties not a structure containing both.

test/pbap-client

index fbe930c..7be8bad 100755 (executable)
@@ -33,8 +33,7 @@ class PbapClient:
                                signal_name="Error",
                                path_keyword="path")
 
-       def register(self, reply, transfer):
-               (path, properties) = reply
+       def register(self, path, properties, transfer):
                transfer.path = path
                transfer.filename = properties["Filename"]
                self.props[path] = transfer
@@ -73,15 +72,15 @@ class PbapClient:
        def pull(self, vcard, params, func):
                req = Transfer(func)
                self.pbap.Pull(vcard, "", params,
-                               reply_handler=lambda r: self.register(r, req),
-                               error_handler=self.error)
+                       reply_handler=lambda o, p: self.register(o, p, req),
+                       error_handler=self.error)
                self.transfers += 1
 
        def pull_all(self, params, func):
                req = Transfer(func)
                self.pbap.PullAll("", params,
-                               reply_handler=lambda r: self.register(r, req),
-                               error_handler=self.error)
+                       reply_handler=lambda o, p: self.register(o, p, req),
+                       error_handler=self.error)
                self.transfers += 1
 
        def flush_transfers(self, func):