← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
386
386
        # subprocess.py that we had to workaround).
387
387
        # However, if 'diff' may not be available
388
388
        self.make_example_branch()
389
 
        # this will be automatically restored by the base bzr test class
390
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
389
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
391
390
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
392
391
                                           universal_newlines=True,
393
392
                                           retcode=None)