← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 19:12:30 UTC
  • mfrom: (3146.4.12 win32fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20080103191230-baidarqql3lct685
Misc cleanups for win32, especially tests (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
21
21
import subprocess
22
22
from tempfile import TemporaryFile
23
23
 
 
24
from bzrlib import tests
24
25
from bzrlib.diff import (
25
26
    DiffFromTool,
26
27
    DiffPath,
664
665
             ' \@\@\n-old\n\+new\n\n')
665
666
 
666
667
    def test_diff_kind_change(self):
 
668
        self.requireFeature(tests.SymlinkFeature)
667
669
        self.build_tree_contents([('old-tree/olddir/',),
668
670
                                  ('old-tree/olddir/oldfile', 'old\n')])
669
671
        self.old_tree.add('olddir')
1257
1259
                                None, None, output)
1258
1260
        self.addCleanup(diff_obj.finish)
1259
1261
        diff_obj._execute('old', 'new')
1260
 
        self.assertEqual(output.getvalue(), 'old new\n')
 
1262
        self.assertEqual(output.getvalue().rstrip(), 'old new')
1261
1263
 
1262
1264
    def test_excute_missing(self):
1263
1265
        diff_obj = DiffFromTool(['a-tool-which-is-unlikely-to-exist'],