← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir_colo/test_supported.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-23 19:11:01 UTC
  • mfrom: (6472.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120223191101-x6g60ci59rhkvp3e
(jelmer) Merge bzr/2.5. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir_colo/test_supported.py
145
145
    def test_branch_reference(self):
146
146
        referenced = self.make_branch('referenced')
147
147
        repo = self.make_repository('repo')
148
 
        repo.bzrdir.set_branch_reference(referenced, name='foo')
 
148
        try:
 
149
            repo.bzrdir.set_branch_reference(referenced, name='foo')
 
150
        except errors.IncompatibleFormat:
 
151
            raise tests.TestNotApplicable(
 
152
                'Control dir does not support creating branch references.')
149
153
        self.assertEquals(referenced.base,
150
154
            repo.bzrdir.get_branch_reference('foo'))