← 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
294
294
                                   "+++ goodbye\t")
295
295
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
296
296
                                 "+baz\n\n")
 
297
 
 
298
 
 
299
class TestDiffOutput(DiffBase):
 
300
 
 
301
    def test_diff_output(self):
 
302
        # check that output doesn't mangle line-endings
 
303
        self.make_example_branch()
 
304
        file('hello', 'wb').write('hello world!\n')
 
305
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
 
306
        self.assert_('\n+hello world!\n' in output)