Merge lp:~dobey/tarmac/close-conn into lp:tarmac

[dobey]

Disconnect the transport immediately after opening the remote.

This should fix the issue, but there's really no good way to test that it does, without trying it directly. I made a simple hack script to open a remote branch, wait a little over 5 minutes, and then try to do something, to test a couple things for how to fix the bug, and this seemed to work there. So I think it should work in normal use as well.

[Chris Johnston (cjohnston)]

Still getting errors: http://paste.ubuntu.com/7598397/

review: Needs Fixing

[Chris Johnston (cjohnston)]

At times it seems to be able to complete merges, other times I still end up with the broken pipe.

[dobey (dobey)]

> At times it seems to be able to complete merges, other times I still end up
> with the broken pipe.

That's certainly odd. If it is still failing in the same way, with this branch, that means the connection is not being disconnected, despite the explicit call being made to disconnect() here. I don't have any good ideas for how else to fix this in tarmac. Digging through the bzrlib code, I did not see a way to force re-establishing the connection.

Unmerged revisions

432. By dobey on 2014-06-04

Disconnect the transport immediately after opening the remote.

=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2013-11-07 17:28:53 +0000
+++ tarmac/branch.py	2014-06-04 01:47:42 +0000
@@ -37,6 +37,10 @@
     def __init__(self, lp_branch, config=False, target=None, launchpad=None):
         self.lp_branch = lp_branch
         self.bzr_branch = bzr_branch.Branch.open(self.lp_branch.bzr_identity)
+
+        # Disconnect to avoid pipe errors when LP drops the connection.
+        self.bzr_branch._transport.disconnect()
+
         if config:
             self.config = BranchConfig(lp_branch.bzr_identity, config)
         else:

=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2013-11-07 17:28:53 +0000
+++ tarmac/tests/test_branch.py	2014-06-04 01:47:42 +0000
@@ -35,6 +35,15 @@
 class TestBranch(BranchTestCase):
     '''Test for Tarmac.branch.Branch.'''
 
+    @patch('bzrlib.transport.Transport.disconnect')
+    def test_branch_disconnected(self, mocked):
+        """Test disconnect is called on the transport after opening."""
+        tree_dir = os.path.join(self.TEST_ROOT, __name__)
+        self.add_branch_config(tree_dir)
+
+        a_branch = branch.Branch.create(MockLPBranch(tree_dir), self.config)
+        mocked.assert_called_once_with()
+
     def test_create(self):
         '''Test the creation of a TarmacBranch instance.'''
         tree_dir = os.path.join(self.TEST_ROOT, 'test_create')