← 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: 2010-05-20 09:27:48 UTC
  • mfrom: (5241.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100520092748-oa7knubtqio8l2rc
(lifeless) Merge 2.1 into trunk with a number of fixes including pyrex 0.9.9
 support. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
33
33
    transform,
34
34
    )
35
35
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import test_win32utils
 
36
from bzrlib.tests import features
37
37
 
38
38
 
39
39
class _AttribFeature(tests.Feature):
1298
1298
                         diff_obj._get_command('old-path', 'new-path'))
1299
1299
 
1300
1300
    def test_from_string_path_with_backslashes(self):
1301
 
        self.requireFeature(test_win32utils.BackslashDirSeparatorFeature)
 
1301
        self.requireFeature(features.backslashdir_feature)
1302
1302
        tool = 'C:\\Tools\\Diff.exe'
1303
1303
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1304
1304
        self.addCleanup(diff_obj.finish)