← 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: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_config.py
364
364
        self.assertLength(5, self.hpss_calls)
365
365
        self.assertLength(1, self.hpss_connections)
366
366
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
367
 
 
368
 
 
369
class TestConfigDirectory(tests.TestCaseWithTransport):
 
370
 
 
371
    def test_parent_alias(self):
 
372
        t = self.make_branch_and_tree('base')
 
373
        t.branch.get_config_stack().set('test', 'base')
 
374
        clone = t.branch.bzrdir.sprout('clone').open_branch()
 
375
        clone.get_config_stack().set('test', 'clone')
 
376
        out, err = self.run_bzr(['config', '-d', ':parent', 'test'],
 
377
                                working_dir='clone')
 
378
        self.assertEquals('base\n', out)