← 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: John Arbash Meinel
  • Date: 2006-07-31 18:58:11 UTC
  • mto: (1900.2.1 bzr.merge.54651)
  • mto: This revision was merged to the branch mainline in revision 1903.
  • Revision ID: john@arbash-meinel.com-20060731185811-a9976f50e047fc03
Just swallow a return code of 2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
108
108
                                     use_stringio=True)
109
109
        self.check_patch(lines)
110
110
 
 
111
    def test_external_diff_binary(self):
 
112
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
113
        self.assertEqual(['Binary files old and new differ\n'], lines)
 
114
 
111
115
    def test_no_external_diff(self):
112
116
        """Check that NoDiff is raised when diff is not available"""
113
117
        # Use os.environ['PATH'] to make sure no 'diff' command is available