← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 10:42:07 UTC
  • mfrom: (6437.3.6 2.5)
  • mto: (6437.3.7 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@vernstok.nl-20120118104207-yc5fhsaz4mupjcam
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
1195
1195
    def test_get_branches(self):
1196
1196
        repo = self.make_repository('branch-1')
1197
1197
        target_branch = repo.bzrdir.create_branch()
1198
 
        self.assertEqual([None], repo.bzrdir.get_branches().keys())
 
1198
        self.assertEqual([""], repo.bzrdir.get_branches().keys())
1199
1199
 
1200
1200
    def test_create_repository(self):
1201
1201
        # a bzrdir can construct a repository for itself.
1342
1342
            raise TestSkipped("Can't initialize %r on transport %r"
1343
1343
                              % (self.bzrdir_format, t))
1344
1344
        dir = bzrdir.BzrDir.open(t.base)
1345
 
        self.assertIs(None, dir._get_selected_branch())
 
1345
        self.assertEqual(u"", dir._get_selected_branch())
1346
1346
 
1347
1347
    def test_root_transport(self):
1348
1348
        dir = self.make_bzrdir('.')