/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Gary van der Merwe
  • Date: 2010-05-05 08:18:32 UTC
  • mfrom: (5206 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5211.
  • Revision ID: garyvdm@gmail.com-20100505081832-ar75izyz4z37r425
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
988
988
        merger.do_merge()
989
989
        self.assertEqual('../branch/reference',
990
990
                         tree.branch.get_reference_info('file-id')[1])
 
991
 
 
992
 
 
993
class TestBranchControlComponent(per_branch.TestCaseWithBranch):
 
994
    """Branch implementations adequately implement ControlComponent."""
 
995
    
 
996
    def test_urls(self):
 
997
        br = self.make_branch('branch')
 
998
        self.assertIsInstance(br.user_url, str)
 
999
        self.assertEqual(br.user_url, br.user_transport.base)
 
1000
        # for all current bzrdir implementations the user dir must be 
 
1001
        # above the control dir but we might need to relax that?
 
1002
        self.assertEqual(br.control_url.find(br.user_url), 0)
 
1003
        self.assertEqual(br.control_url, br.control_transport.base)