← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_config.py

  • Committer: Patch Queue Manager
  • Date: 2012-08-01 09:54:49 UTC
  • mfrom: (6548.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20120801095449-yzevoszth5odzgjk
(vila) Merge 2.5 including fix for bug #957049 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_config.py
382
382
        self.assertLength(5, self.hpss_calls)
383
383
        self.assertLength(1, self.hpss_connections)
384
384
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
385
 
 
386
 
 
387
class TestConfigDirectory(tests.TestCaseWithTransport):
 
388
 
 
389
    def test_parent_alias(self):
 
390
        t = self.make_branch_and_tree('base')
 
391
        t.branch.get_config_stack().set('test', 'base')
 
392
        clone = t.branch.bzrdir.sprout('clone').open_branch()
 
393
        clone.get_config_stack().set('test', 'clone')
 
394
        out, err = self.run_bzr(['config', '-d', ':parent', 'test'],
 
395
                                working_dir='clone')
 
396
        self.assertEquals('base\n', out)