/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-21 19:28:45 UTC
  • mfrom: (2211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2212.
  • Revision ID: john@arbash-meinel.com-20061221192845-fmv60t3k5t0xxks4
[merge] bzr.dev 2211

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
118
118
        out, err = self.runbzr('diff does-not-exist', retcode=3)
119
119
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
120
120
 
 
121
    def test_diff_illegal_revision_specifiers(self):
 
122
        out, err = self.runbzr('diff -r 1..23..123', retcode=3)
 
123
        self.assertContainsRe(err, 'one or two revision specifiers')
 
124
 
121
125
    def test_diff_unversioned(self):
122
126
        # Get an error when diffing a non-versioned file.
123
127
        # (Malone #3619)
294
298
                                   "+++ goodbye\t")
295
299
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
296
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)