Merge lp:~verterok/ubuntuone-client/u1sdtool_fix_list-folders_subscribed into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix u1sdtool --list-folders to correctly show unsubscribed status.

This branch fix u1sdtool --list-folders to correctly show unsubscribed status.

[Roman Yepishev (rye)]

Tested by listing my folders:
Folder list:
  id=20b0b044-523f-462a-8938-7e2fa16030b0 subscribed=False path=/home/rtg/Public
  id=a19bb966-a0e9-4f05-a927-f9fc81986258 subscribed=True path=/home/rtg/.ubuntuone/Purchased from Ubuntu One
  id=5577d808-6a3f-4873-8b27-1fd644bd7e20 subscribed=True path=/home/rtg/Documents

review: Approve

=== modified file 'tests/syncdaemon/test_u1sdtool.py'
--- tests/syncdaemon/test_u1sdtool.py	2010-07-29 19:34:35 +0000
+++ tests/syncdaemon/test_u1sdtool.py	2010-08-02 21:09:43 +0000
@@ -301,8 +301,8 @@
         return d
 
     @defer.inlineCallbacks
-    def test_show_folders(self):
-        """test the output of --list-folders """
+    def test_show_folders_subscribed(self):
+        """Test the output of --list-folders."""
         out = StringIO()
         path = u'ñoño'.encode('utf-8')
         suggested_path = os.path.join("~", u'ñoño')
@@ -312,13 +312,26 @@
         yield self.main.vm.add_udf(udf)
         expected = u"Folder list:\n  id=folder_id subscribed=True " + \
                    u"path=\xf1o\xf1o\n"
-        d = self.tool.get_folders()
-        d.addCallback(lambda result: show_folders(result, out))
-        def check(result):
-            """check the output"""
-            self.assertEquals(out.getvalue(), expected)
-        d.addCallback(check)
-        yield d
+        result = yield self.tool.get_folders()
+        show_folders(result, out)
+        self.assertEquals(out.getvalue(), expected)
+
+    @defer.inlineCallbacks
+    def test_show_folders_unsubscribed(self):
+        """Test the output of --list-folders with a unsubscribed folder."""
+        out = StringIO()
+        path = u'ñoño'.encode('utf-8')
+        suggested_path = os.path.join("~", u'ñoño')
+
+        udf = UDF("folder_id", "node_id", suggested_path, path,
+                  subscribed=True)
+        yield self.main.vm.add_udf(udf)
+        self.main.vm.unsubscribe_udf(udf.id)
+        expected = u"Folder list:\n  id=folder_id subscribed=False " + \
+                   u"path=\xf1o\xf1o\n"
+        result = yield self.tool.get_folders()
+        show_folders(result, out)
+        self.assertEquals(out.getvalue(), expected)
 
     @defer.inlineCallbacks
     def generic_show_dirty_nodes(self, encoding, empty=False):

=== modified file 'ubuntuone/syncdaemon/tools.py'
--- ubuntuone/syncdaemon/tools.py	2010-07-29 19:34:15 +0000
+++ ubuntuone/syncdaemon/tools.py	2010-08-02 21:09:43 +0000
@@ -793,7 +793,8 @@
         out.write("Folder list:\n")
     for folder in folders:
         msg_template = '  id=%s subscribed=%s path=%s\n'
-        out.write(msg_template % (folder['volume_id'], folder['subscribed'],
+        out.write(msg_template % (folder['volume_id'],
+                                  bool(folder['subscribed']),
                                   folder['path']))