← 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: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir_colo/test_supported.py
135
135
        self.assertEqual(target_branch.base,
136
136
                         repo.bzrdir.get_branches()['foo'].base)
137
137
 
 
138
    def test_branch_name_with_slash(self):
 
139
        repo = self.make_repository('branch-1')
 
140
        target_branch = repo.bzrdir.create_branch(name='foo/bar')
 
141
        self.assertEqual(['foo/bar'], repo.bzrdir.get_branches().keys())
 
142
        self.assertEqual(
 
143
            target_branch.base, repo.bzrdir.open_branch(name='foo/bar').base)
 
144
 
138
145
    def test_branch_reference(self):
139
146
        referenced = self.make_branch('referenced')
140
147
        repo = self.make_repository('repo')