← 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 bzr.dev, update to use new hooks.

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
323
323
        self.build_tree_contents([('hello', 'hello world!\n')])
324
324
        output = self.run_bzr('diff --format=boo', retcode=1)
325
325
        self.assertTrue("BOO!" in output[0])
 
326
        output = self.run_bzr('diff -Fboo', retcode=1)
 
327
        self.assertTrue("BOO!" in output[0])
 
328
 
326
329
 
327
330
class TestCheckoutDiff(TestDiff):
328
331
 
386
389
        # subprocess.py that we had to workaround).
387
390
        # However, if 'diff' may not be available
388
391
        self.make_example_branch()
389
 
        # this will be automatically restored by the base bzr test class
390
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
392
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
391
393
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
392
394
                                           universal_newlines=True,
393
395
                                           retcode=None)