launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/testfix-translate-path-private into lp:launchpad.

Commit message:
Fix the codehosting VFS to handle the additional private key returned by translatePath.

Requested reviews:
  Colin Watson (cjwatson)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/testfix-translate-path-private/+merge/260143

Fix the codehosting VFS to handle the additional private key returned by translatePath.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2013-01-07 02:40:55 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2015-05-26 12:47:15 +0000
@@ -304,7 +304,8 @@
         data['trailing_path'] = trailing_path
         return factory(**data), trailing_path
 
-    def _makeBranchTransport(self, id, writable, trailing_path=''):
+    def _makeBranchTransport(self, id, writable, trailing_path='',
+                             private=False):
         if writable:
             dispatch = self._rw_dispatch
         else:

=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfsclient.py'
--- lib/lp/codehosting/vfs/tests/test_branchfsclient.py	2013-01-07 02:40:55 +0000
+++ lib/lp/codehosting/vfs/tests/test_branchfsclient.py	2015-05-26 12:47:15 +0000
@@ -56,7 +56,8 @@
         deferred = client.translatePath('/' + branch.unique_name)
         deferred.addCallback(
             self.assertEqual,
-            (BRANCH_TRANSPORT, dict(id=branch.id, writable=False), ''))
+            (BRANCH_TRANSPORT,
+             dict(id=branch.id, writable=False, private=False), ''))
         return deferred
 
     def test_get_matched_part(self):