← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_pull.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-17 09:23:19 UTC
  • mfrom: (5301 +trunk)
  • mto: (5247.1.8 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617092319-da2bzdtf3j0voynf
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_pull.py
98
98
                          master_tree.branch.pull, other.branch, local = True)
99
99
        self.assertEqual([rev1], master_tree.branch.revision_history())
100
100
 
101
 
    def test_pull_raises_specific_error_on_master_connection_error(self):
102
 
        master_tree = self.make_branch_and_tree('master')
103
 
        checkout = master_tree.branch.create_checkout('checkout')
104
 
        other = master_tree.branch.bzrdir.sprout('other').open_workingtree()
105
 
        # move the branch out of the way on disk to cause a connection
106
 
        # error.
107
 
        os.rename('master', 'master_gone')
108
 
        # try to pull, which should raise a BoundBranchConnectionFailure.
109
 
        self.assertRaises(errors.BoundBranchConnectionFailure,
110
 
                checkout.branch.pull, other.branch)
111
 
 
112
101
    def test_pull_returns_result(self):
113
102
        parent = self.make_branch_and_tree('parent')
114
103
        parent.commit('1st post', rev_id='P1')