← 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: Martin Pool
  • Date: 2006-12-21 03:59:43 UTC
  • mfrom: (2206 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2207.
  • Revision ID: mbp@sourcefrog.net-20061221035943-2qazd36lrxms0bug
merge bzr.dev, reconcile with option changes

Show diffs side-by-side

added added

removed removed

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