← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_debug.py
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')