Merge lp:~verterok/ubuntuone-client/fix-702035 into lp:ubuntuone-client

[Guillermo Gonzalez]

Shares created from a ShareVolume are always marked as accepted.

This branch change the way Share objects are created when the protocol object is a ShareVolume, now we always mark it as accepted as we don't have that info in the protocol and the accepted value is false, but it's implicit to the type of the object.

[Natalia Bidart (nataliabidart)]

+1

Can't test IRL right now, but code looks good and tests pass.

review: Approve

[Roman Yepishev (rye)]

Works great, the folder is created immediately after I click accept share.

review: Approve (fieldtest)

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-01-07 17:24:11 +0000
+++ tests/syncdaemon/test_vm.py	2011-01-18 19:19:09 +0000
@@ -1808,42 +1808,17 @@
         self.assertTrue(self.handler.check_warning("missing volume id"))
 
     @defer.inlineCallbacks
-    def _test_handle_SV_VOLUME_CREATED(self, auto_subscribe):
-        """Test for handle_SV_VOLUME_CREATED."""
-        user_conf = config.get_user_config()
-        user_conf.set_udf_autosubscribe(auto_subscribe)
+    def test_handle_SV_VOLUME_CREATED_share(self):
+        """Test for handle_SV_VOLUME_CREATED with shares."""
         # start the test
-        udf_id = uuid.uuid4()
-        udf_volume = volumes.UDFVolume(udf_id, 'udf_uuid', None, 10, u'~/ñoño')
         share_id = uuid.uuid4()
-        share_volume = volumes.ShareVolume(share_id, 'fake_share_uuid', None,
-                                           10, 'to_me', u'ñoño',
-                                           'username', u'visible_username',
-                                           True, 'View')
+        share_volume = volumes.ShareVolume(
+            share_id, 'fake_share_uuid', None, 10, 'to_me', u'ñoño',
+            'username', u'visible_username',
+            False, # this is how the protocol send it
+            'View')
         # initialize the the root
         self.vm._got_root('root_uuid')
-
-        d = defer.Deferred()
-        self._listen_for('VM_UDF_CREATED', d.callback)
-        rescan_cb = defer.Deferred()
-        self.patch(self.main.action_q, 'rescan_from_scratch', rescan_cb.callback)
-
-        with environ('HOME', self.home_dir):
-            self.vm.handle_SV_VOLUME_CREATED(udf_volume)
-        info = yield d
-        udf = info['udf']
-        self.assertEquals(udf.volume_id, str(udf_id))
-        self.assertIn(str(udf_id), self.vm.udfs)
-        if auto_subscribe:
-            self.assertTrue(udf.subscribed)
-            self.assertTrue(os.path.exists(udf.path))
-            # check that rescan_from_scratch is called
-            vol_id = yield rescan_cb
-            self.assertEqual(vol_id, udf.volume_id)
-        else:
-            self.assertFalse(udf.subscribed)
-            self.assertFalse(os.path.exists(udf.path))
-        # subscribe a new listener
         d = defer.Deferred()
         self._listen_for('VM_SHARE_CREATED', d.callback)
         rescan_cb = defer.Deferred()
@@ -1860,13 +1835,45 @@
         vol_id = yield rescan_cb
         self.assertEqual(vol_id, share.volume_id)
 
-    def test_handle_SV_VOLUME_CREATED_subscribe(self):
+    @defer.inlineCallbacks
+    def _test_handle_SV_VOLUME_CREATED_udf(self, auto_subscribe):
+        """Test for handle_SV_VOLUME_CREATED with udfs."""
+        user_conf = config.get_user_config()
+        user_conf.set_udf_autosubscribe(auto_subscribe)
+        # start the test
+        udf_id = uuid.uuid4()
+        udf_volume = volumes.UDFVolume(udf_id, 'udf_uuid', None, 10, u'~/ñoño')
+        # initialize the the root
+        self.vm._got_root('root_uuid')
+
+        d = defer.Deferred()
+        self._listen_for('VM_UDF_CREATED', d.callback)
+        rescan_cb = defer.Deferred()
+        self.patch(self.main.action_q, 'rescan_from_scratch', rescan_cb.callback)
+
+        with environ('HOME', self.home_dir):
+            self.vm.handle_SV_VOLUME_CREATED(udf_volume)
+        info = yield d
+        udf = info['udf']
+        self.assertEquals(udf.volume_id, str(udf_id))
+        self.assertIn(str(udf_id), self.vm.udfs)
+        if auto_subscribe:
+            self.assertTrue(udf.subscribed)
+            self.assertTrue(os.path.exists(udf.path))
+            # check that rescan_from_scratch is called
+            vol_id = yield rescan_cb
+            self.assertEqual(vol_id, udf.volume_id)
+        else:
+            self.assertFalse(udf.subscribed)
+            self.assertFalse(os.path.exists(udf.path))
+
+    def test_handle_SV_VOLUME_CREATED_udf_subscribe(self):
         """Test SV_VOLUME_CREATED with udf auto_subscribe """
-        return self._test_handle_SV_VOLUME_CREATED(True)
+        return self._test_handle_SV_VOLUME_CREATED_udf(True)
 
-    def test_handle_SV_VOLUME_CREATED_no_subscribe(self):
+    def test_handle_SV_VOLUME_CREATED_udf_no_subscribe(self):
         """Test SV_VOLUME_CREATED without udf auto_subscribe """
-        return self._test_handle_SV_VOLUME_CREATED(False)
+        return self._test_handle_SV_VOLUME_CREATED_udf(False)
 
     @defer.inlineCallbacks
     def test_handle_SV_VOLUME_DELETED(self):

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-01-13 22:06:43 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-01-18 19:19:09 +0000
@@ -195,7 +195,8 @@
                     path=path, name=share_volume.share_name,
                     other_username=share_volume.other_username,
                     other_visible_name=share_volume.other_visible_name,
-                    accepted=share_volume.accepted,
+                    # if it's form a share volume, it was accepted
+                    accepted=True,
                     access_level=share_volume.access_level,
                     generation=share_volume.generation,
                     free_bytes=share_volume.free_bytes)