Merge lp:~facundo/magicicada-gui/support-two-new-ops into lp:magicicada-gui

[Facundo Batista]

Support the ChangePublicAccess and AnswerShare operations.

[Natalia Bidart (nataliabidart)]

Very nice!

review: Approve

=== modified file 'magicicada/dbusiface.py'
--- magicicada/dbusiface.py	2010-06-21 17:10:41 +0000
+++ magicicada/dbusiface.py	2010-07-02 11:47:22 +0000
@@ -228,7 +228,8 @@
     def _parse_mq(self, data):
         """Parse MetaQueue string to extract its data."""
         if data in ('AccountInquiry', 'FreeSpaceInquiry', 'GetPublicFiles',
-                    'ListShares', 'ListVolumes', 'Query'):
+                    'ListShares', 'ListVolumes', 'Query',
+                    'ChangePublicAccess', 'AnswerShare'):
             return QueueData(operation=data, path=None, node=None, share=None)
 
         m = RE_OP_LISTDIR.match(data)
 
=== modified file 'magicicada/tests/test_dbusiface.py'
--- magicicada/tests/test_dbusiface.py	2010-06-20 19:57:53 +0000
+++ magicicada/tests/test_dbusiface.py	2010-07-02 11:47:22 +0000
@@ -478,6 +478,30 @@
         self.assertEqual(data.share, 'a')
         self.assertEqual(data.node, 'b')
 
+    @defer.inlineCallbacks
+    def test_ChangePublicAccess(self):
+        """Test meta with ChangePublicAccess."""
+        cmd = 'ChangePublicAccess'
+        self.fake_sdt_response('waiting_metadata', [cmd])
+        rcv = yield self.dbus.get_meta_queue()
+        data = rcv[0]
+        self.assertEqual(data.operation, 'ChangePublicAccess')
+        self.assertEqual(data.path, None)
+        self.assertEqual(data.share, None)
+        self.assertEqual(data.node, None)
+
+    @defer.inlineCallbacks
+    def test_AnswerShare(self):
+        """Test meta with AnswerShare."""
+        cmd = 'AnswerShare'
+        self.fake_sdt_response('waiting_metadata', [cmd])
+        rcv = yield self.dbus.get_meta_queue()
+        data = rcv[0]
+        self.assertEqual(data.operation, 'AnswerShare')
+        self.assertEqual(data.path, None)
+        self.assertEqual(data.share, None)
+        self.assertEqual(data.node, None)
+
 
 class TestDataProcessingFolders(SafeTests):
     """Process Folders data before sending it to SyncDaemon."""