Merge lp:~verterok/ubuntuone-client/fix-452682-stable into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix 'Shared With Me' symlink if the target was changed and the link is broken.

Fix 'Shared With Me' symlink if the target was changed and the link is broken.

[Joshua Hoover (joshuahoover)]

Passed test in bug #452682.

review: Approve (ran branch and verified fix)

[Roman Yepishev (rye)]

Patched local stable install and tested it - works fine.

review: Approve

[Roman Yepishev (rye)]

But I believe the branch should be updated first to get rid of conflicts

review: Needs Fixing

[Guillermo Gonzalez (verterok)]

Hi Roman, I made a mistake while doing the merge proposal, the branch should target stable-1-2 instead of trunk, I'll submit a new merge proposal

Thanks!

Unmerged revisions

509. By Guillermo Gonzalez on 2010-05-21

check if the symlink target is the shares dir instead if it exists.

508. By Guillermo Gonzalez on 2010-05-18

fix 'Shared With Me' symlink if the target is deleted/changed and is broken.

507. By Facundo Batista on 2010-04-23

Support FS_FILE_CREATE while having the file in LOCAL.

506. By dobey on 2010-04-21

[backport] r508
Use the correct MODAL flag to avoid AttributeError
Use a try/finally to destroy the dialog when closed

=== modified file 'bin/ubuntuone-preferences'
=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2010-05-11 20:40:47 +0000
+++ tests/syncdaemon/test_sync.py	2010-05-18 19:48:27 +0000
@@ -268,6 +268,7 @@
         sync.handle_AQ_DOWNLOAD_DOES_NOT_EXIST(**kwargs)
         self.assertTrue(self.called, 'nothing was called')
 
+<<<<<<< TREE
     def test_handle_FILE_CREATE_while_LOCAL(self):
         """A FS_FILE_CREATE is received with the node in LOCAL."""
         sync = Sync(main=self.main)
@@ -315,6 +316,30 @@
 
 
 class SyncStateMachineRunnerTestCase(BaseSync):
+=======
+    def test_handle_FILE_CREATE_while_LOCAL(self):
+        """A FS_FILE_CREATE is received with the node in LOCAL."""
+        sync = Sync(main=self.main)
+        self.called = False
+
+        def faked_nothing(ssmr, event, params, *args):
+            """Wrap SSMR.nothing to test."""
+            self.called = True
+        SyncStateMachineRunner.nothing = faked_nothing
+
+        # create a file and put it in local
+        fsm = self.main.fs
+        somepath = os.path.join(self.root, 'somepath')
+        mdid = fsm.create(somepath, '')
+        fsm.set_by_mdid(mdid, local_hash='somehash')
+
+        # send the event, and check that it called its .nothing()
+        sync.handle_FS_FILE_CREATE(somepath)
+        self.assertTrue(self.called)
+
+
+class SyncStateMachineRunnerTestCase(BaseTwistedTestCase):
+>>>>>>> MERGE-SOURCE
     """Tests for the SyncStateMachineRunner."""
 
     def setUp(self):

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-04-07 13:56:56 +0000
+++ tests/syncdaemon/test_vm.py	2010-05-18 19:48:27 +0000
@@ -1759,6 +1759,7 @@
         self.assertEquals(result[0], udf_path)
         self.assertEquals(result[1], "UDFs can not be a symlink")
 
+
 class MetadataTestCase(BaseTwistedTestCase):
     md_version_None = False
     main = None
@@ -2649,6 +2650,18 @@
             self.assertTrue(isinstance(share, _Share))
             self.assertTrue(isinstance(old_share, _Share))
 
+    def test_broken_symlink_latest_metadata(self):
+        """Test vm startup with latest metadata and a broken symlink."""
+        self._build_layout_version_4()
+        os.unlink(self.shares_dir_link)
+        # create a broken link
+        os.symlink('foo', self.shares_dir_link)
+        # we want to keep a refernece to main in order to shutdown
+        # pylint: disable-msg=W0201
+        self.main = FakeMain(self.root_dir, self.shares_dir,
+                             self.data_dir, self.partials_dir)
+        self.check_version()
+
 
 class BrokenOldMDVersionUpgradeTests(MetadataOldLayoutTests):
     """MetadataOldLayoutTests with broken .version file."""

=== renamed file 'ubuntuone/syncdaemon/u1fsfsm.ods' => 'ubuntuone/syncdaemon/u1fsfsm.ods.OTHER'
Binary files ubuntuone/syncdaemon/u1fsfsm.ods	2010-05-06 18:07:50 +0000 and ubuntuone/syncdaemon/u1fsfsm.ods.OTHER	2010-05-18 19:48:27 +0000 differ
=== modified file 'ubuntuone/syncdaemon/u1fsfsm.py'
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-04-07 13:56:56 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-05-18 19:48:27 +0000
@@ -309,6 +309,10 @@
         if not os.path.exists(self.m.shares_dir_link):
             self.log.debug('creating Shares symlink: %r -> %r',
                            self.m.shares_dir_link, self.m.shares_dir)
+            # remove the symlink if it's broken
+            if os.path.islink(self.m.shares_dir_link) and \
+               not os.path.exists(os.readlink(self.m.shares_dir_link)):
+                os.remove(self.m.shares_dir_link)
             os.symlink(self.m.shares_dir, self.m.shares_dir_link)
         # make the shares_dir read only
         os.chmod(self.m.shares_dir, 0555)