← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-16 07:54:18 UTC
  • mfrom: (3537.3.5 stacking)
  • Revision ID: pqm@pqm.ubuntu.com-20080716075418-xbachkqt622m73v1
(mbp) post-merge review cleanups for stacking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
451
451
        child_branch, new_child_transport = self.prepare_default_stacking()
452
452
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
453
453
        self.assertEqual(child_branch.base,
454
 
                         new_child.open_branch().get_stacked_on())
 
454
                         new_child.open_branch().get_stacked_on_url())
455
455
 
456
456
    def test_sprout_obeys_stacking_policy(self):
457
457
        child_branch, new_child_transport = self.prepare_default_stacking()
458
458
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
459
459
        self.assertEqual(child_branch.base,
460
 
                         new_child.open_branch().get_stacked_on())
 
460
                         new_child.open_branch().get_stacked_on_url())
461
461
 
462
462
    def test_add_fallback_repo_handles_absolute_urls(self):
463
463
        stack_on = self.make_branch('stack_on', format='development1')
477
477
        policy = bzrdir.UseExistingRepository(stacked.repository,
478
478
            '.', stack_on.base)
479
479
        policy.configure_branch(stacked)
480
 
        self.assertEqual('..', stacked.get_stacked_on())
 
480
        self.assertEqual('..', stacked.get_stacked_on_url())
481
481
 
482
482
    def test_relative_branch_stacking_to_absolute(self):
483
483
        stack_on = self.make_branch('stack_on', format='development1')
486
486
            '.', self.get_readonly_url('stack_on'))
487
487
        policy.configure_branch(stacked)
488
488
        self.assertEqual(self.get_readonly_url('stack_on'),
489
 
                         stacked.get_stacked_on())
 
489
                         stacked.get_stacked_on_url())
490
490
 
491
491
 
492
492
class ChrootedTests(TestCaseWithTransport):