← Back to branch summary

~jelmer/brz/hpss-working-tree-update

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_debug.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-18 20:21:49 UTC
  • mfrom: (6313.1.655 work)
  • Revision ID: jelmer@jelmer.uk-20180518202149-xcn8r775zgwi8x5n
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_debug.py
21
21
import sys
22
22
import time
23
23
 
24
 
from bzrlib import debug, tests
 
24
from breezy import debug, tests
25
25
 
26
26
 
27
27
class TestDebugOption(tests.TestCaseInTempDir):
52
52
        # I would like to avoid run_bzr_subprocess here, but we need it to be
53
53
        # connected to a real TextUIFactory. The NullProgressView always
54
54
        # ignores transport activity.
55
 
        env = {'BZR_PROGRESS_BAR': 'text'}
56
 
        out, err = self.run_bzr_subprocess('branch -Dbytes %s/tree target'
57
 
                                           % (remote_trans.base,),
58
 
                                           env_changes=env)
 
55
        out, err = self.run_bzr_subprocess(
 
56
            'branch -Dbytes -Oprogress_bar=text %s/tree target'
 
57
            % (remote_trans.base,))
59
58
        self.assertContainsRe(err, 'Branched 1 revision')
60
59
        self.assertContainsRe(err, 'Transferred:.*kB')