← 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: Vincent Ladeuil
  • Date: 2012-01-05 15:54:17 UTC
  • mfrom: (6428 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105155417-zvjqr0v78zp332e0
Merge trunk resolving conflicts and fixing more test failures related to
more option being migrated which in turn reduce some hpss_calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_config.py
146
146
              hello = world
147
147
            ''')
148
148
 
 
149
    def test_cmd_line(self):
 
150
        self.bazaar_config.set_user_option('hello', 'world')
 
151
        script.run_script(self, '''\
 
152
            $ bzr config -Ohello=bzr
 
153
            cmdline:
 
154
              hello = bzr
 
155
            bazaar:
 
156
              [DEFAULT]
 
157
              hello = world
 
158
            ''')
 
159
 
149
160
 
150
161
class TestConfigDisplayWithPolicy(tests.TestCaseWithTransport):
151
162
 
351
362
        # become necessary for this use case. Please do not adjust this number
352
363
        # upwards without agreement from bzr's network support maintainers.
353
364
        self.assertLength(5, self.hpss_calls)
 
365
        self.assertLength(1, self.hpss_connections)
354
366
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)