← Back to branch summary

~torkvemada/bzr/commit_hooks

« back to all changes in this revision

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

  • Committer: Vsevolod Velichko
  • Date: 2012-10-02 12:35:15 UTC
  • mfrom: (6538.1.29 +trunk)
  • Revision ID: torkvema@gmail.com-20121002123515-4lao1ci5m1bvsg7a
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
388
388
        # subprocess.py that we had to workaround).
389
389
        # However, if 'diff' may not be available
390
390
        self.make_example_branch()
391
 
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
392
 
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
393
 
                                           universal_newlines=True,
394
 
                                           retcode=None)
 
391
        out, err = self.run_bzr_subprocess(
 
392
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
 
393
            universal_newlines=True,
 
394
            retcode=None)
395
395
        if 'Diff is not installed on this machine' in err:
396
396
            raise tests.TestSkipped("No external 'diff' is available")
397
397
        self.assertEqual('', err)