← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_create_clone.py
96
96
        revid = tree.commit('a second commit')
97
97
        source = tree.branch
98
98
        target_transport = self.get_transport('target')
99
 
        try:
100
 
            result = tree.branch.create_clone_on_transport(target_transport,
101
 
                stacked_on=trunk.base)
102
 
        except errors.UnstackableBranchFormat:
103
 
            if not trunk.repository._format.supports_full_versioned_files:
104
 
                raise tests.TestNotApplicable("can not stack on format")
105
 
            raise
 
99
        result = tree.branch.create_clone_on_transport(target_transport,
 
100
            stacked_on=trunk.base)
106
101
        self.assertEqual(revid, result.last_revision())
107
102
        self.assertEqual(trunk.base, result.get_stacked_on_url())
108
103
 
138
133
        self.hook_calls = []
139
134
        branch.Branch.hooks.install_named_hook(
140
135
            'pre_change_branch_tip', self.assertBranchHookBranchIsStacked, None)
141
 
        try:
142
 
            result = tree.branch.create_clone_on_transport(target_transport,
143
 
                stacked_on=trunk.base)
144
 
        except errors.UnstackableBranchFormat:
145
 
            if not trunk.repository._format.supports_full_versioned_files:
146
 
                raise tests.TestNotApplicable("can not stack on format")
147
 
            raise
 
136
        result = tree.branch.create_clone_on_transport(target_transport,
 
137
            stacked_on=trunk.base)
148
138
        self.assertEqual(revid, result.last_revision())
149
139
        self.assertEqual(trunk.base, result.get_stacked_on_url())
150
140
        # Smart servers invoke hooks on both sides