← 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

  • Committer: Andrew Bennetts
  • Date: 2010-10-13 00:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101013002641-9tlh9k89mlj1666m
Keep docs-plain working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
 
 
329
326
 
330
327
class TestCheckoutDiff(TestDiff):
331
328
 
389
386
        # subprocess.py that we had to workaround).
390
387
        # However, if 'diff' may not be available
391
388
        self.make_example_branch()
392
 
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
 
389
        # this will be automatically restored by the base bzr test class
 
390
        os.environ['BZR_PROGRESS_BAR'] = 'none'
393
391
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
394
392
                                           universal_newlines=True,
395
393
                                           retcode=None)