Merge lp:~facundo/ubuntuone-client/dbus-inform-all-queue into lp:ubuntuone-client

[Facundo Batista]

Include what the Queue is doing in the information published through DBus.

Include what the Queue is doing in the information published through DBus.

The interfaces to know what content and meta queues are doing lacked what they were currently doing, and this information was missing elsewhere.

The best solution was to change them to include that information: not only the queued for the future commands, but the full queue (queued for the future and what it's currently doing).

Tests attached.

[Natalia Bidart (nataliabidart)]

Good work!

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Looks good and tests pass

review: Approve

=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2010-03-26 18:29:38 +0000
+++ tests/syncdaemon/test_dbus.py	2010-04-08 00:12:27 +0000
@@ -211,26 +211,31 @@
         self.main.vm.add_share(Share(path=share_path, volume_id='share_id'))
         a_path = os.path.join(share_path, "path_a")
         b_path = os.path.join(share_path, "path_b")
+        c_path = os.path.join(share_path, "path_c")
         self.fs_manager.create(a_path, "share_id")
         self.fs_manager.create(b_path, "share_id")
+        self.fs_manager.create(c_path, "share_id")
         self.fs_manager.set_node_id(a_path, "node_id_a")
         self.fs_manager.set_node_id(b_path, "node_id_b")
+        self.fs_manager.set_node_id(c_path, "node_id_c")
         # inject the fake data
+        self.action_q.content_queue._head = FakeCommand("share_id",
+                                                        "node_id_a")
         self.action_q.content_queue.waiting.extend([
-                FakeCommand("share_id", "node_id_a"),
-                FakeCommand("share_id", "node_id_b")])
+                FakeCommand("share_id", "node_id_b"),
+                FakeCommand("share_id", "node_id_c")])
         # OK, testing time
         client = DBusClient(self.bus, '/status', DBUS_IFACE_STATUS_NAME)
         d = defer.Deferred()
         self.second = False
         def waiting_handler(result):
             """ waiting_content reply handler """
-            self.assertEquals(2, len(result))
+            self.assertEquals(3, len(result))
             # the second time we're called, the result should be reversed
             if self.second:
-                node_b, node_a = result
+                node_a, node_c, node_b = result
             else:
-                node_a, node_b = result
+                node_a, node_b, node_c = result
 
             self.assertEquals(a_path, str(node_a['path']))
             self.assertEquals(b_path, str(node_b['path']))
@@ -244,7 +249,7 @@
                 d.callback(True)
             else:
                 # the last shall be the first, et cetera.
-                client.call_method('schedule_next', 'share_id', 'node_id_b',
+                client.call_method('schedule_next', 'share_id', 'node_id_c',
                                    reply_handler=reschedule_handler,
                                    error_handler=self.error_handler)
         def reschedule_handler(result):
@@ -262,28 +267,27 @@
     def test_waiting_metadata(self):
         """Test Status.waiting_metadata with fake data in the AQ."""
         # inject the fake data
+        self.action_q.meta_queue._head = FakeCommand("n_a_foo", "n_a_bar")
         self.action_q.meta_queue.waiting.extend([
-                FakeCommand("node_a_foo", "node_a_bar"),
-                FakeCommand("node_b_foo", "node_b_bar")])
-        # OK, testing time
+                FakeCommand("n_b_foo", "n_b_bar"),
+                FakeCommand("n_c_foo", "n_c_bar")])
+
+        # testing time
         client = DBusClient(self.bus, '/status', DBUS_IFACE_STATUS_NAME)
         d = defer.Deferred()
         def waiting_handler(result):
-            """waiting_metadata reply handler."""
-            self.assertEquals(2, len(result))
-            # the second time we're called, the result should be reversed
-            node_a, node_b = result
-            self.assertEquals(str(FakeCommand("node_a_foo", "node_a_bar")),
-                              node_a)
-            self.assertEquals(str(FakeCommand("node_b_foo", "node_b_bar")),
-                              node_b)
+            """Reply handler."""
+            self.assertEquals(3, len(result))
+            node_a, node_b, node_c = result
+            self.assertEquals(str(FakeCommand("n_a_foo", "n_a_bar")), node_a)
+            self.assertEquals(str(FakeCommand("n_b_foo", "n_b_bar")), node_b)
+            self.assertEquals(str(FakeCommand("n_c_foo", "n_c_bar")), node_c)
             d.callback(True)
         client.call_method('waiting_metadata',
                            reply_handler=waiting_handler,
                            error_handler=self.error_handler)
         return d
 
-
     def test_contq_changed(self):
         """Test the Status.ContentQueueChanged signal."""
         # prepare the VM so it lies for us

=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-03-26 20:16:23 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-04-08 00:12:27 +0000
@@ -199,8 +199,9 @@
         """Return a list of the operations in the meta-queue."""
         logger.debug('called waiting_metadata')
         waiting_metadata = []
-        for cmd in self.action_queue.meta_queue.waiting:
-            waiting_metadata.append(str(cmd))
+        for cmd in self.action_queue.meta_queue.full_queue():
+            if cmd is not None:
+                waiting_metadata.append(str(cmd))
         return waiting_metadata
 
     @dbus.service.method(DBUS_IFACE_STATUS_NAME, out_signature='aa{ss}')
@@ -210,7 +211,9 @@
         """
         logger.debug('called waiting_content')
         waiting_content = []
-        for cmd in self.action_queue.content_queue.waiting:
+        for cmd in self.action_queue.content_queue.full_queue():
+            if cmd is None:
+                continue
             try:
                 if IMarker.providedBy(cmd.node_id):
                     # it's a marker! so it's the mdid :)