← 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: John Arbash Meinel
  • Date: 2007-07-12 18:10:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070712181059-xnomv3tzzsb2hpx5
Add NEWS entries for performance improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
 
18
 
"""Black-box tests for bzr diff."""
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr diff.
 
19
"""
19
20
 
20
21
import os
21
22
import re
22
23
 
23
 
from bzrlib import (
24
 
    tests,
25
 
    workingtree,
26
 
    )
27
 
from bzrlib.diff import (
28
 
    DiffTree,
29
 
    format_registry as diff_format_registry,
30
 
    )
31
 
from bzrlib.tests import (
32
 
    features,
33
 
    )
 
24
import bzrlib
 
25
from bzrlib import workingtree
 
26
from bzrlib.branch import Branch
 
27
from bzrlib.tests import TestSkipped
 
28
from bzrlib.tests.blackbox import ExternalBase
34
29
 
35
30
 
36
31
def subst_dates(string):
39
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
40
35
 
41
36
 
42
 
class DiffBase(tests.TestCaseWithTransport):
 
37
class DiffBase(ExternalBase):
43
38
    """Base class with common setup method"""
44
39
 
45
40
    def make_example_branch(self):
 
41
        # FIXME: copied from test_too_much -- share elsewhere?
46
42
        tree = self.make_branch_and_tree('.')
47
 
        self.build_tree_contents([
48
 
            ('hello', 'foo\n'),
49
 
            ('goodbye', 'baz\n')])
 
43
        open('hello', 'wb').write('foo\n')
50
44
        tree.add(['hello'])
51
45
        tree.commit('setup')
 
46
        open('goodbye', 'wb').write('baz\n')
52
47
        tree.add(['goodbye'])
53
48
        tree.commit('setup')
54
 
        return tree
55
49
 
56
50
 
57
51
class TestDiff(DiffBase):
58
52
 
59
53
    def test_diff(self):
60
 
        tree = self.make_example_branch()
61
 
        self.build_tree_contents([('hello', 'hello world!')])
62
 
        tree.commit(message='fixing hello')
 
54
        self.make_example_branch()
 
55
        file('hello', 'wt').write('hello world!')
 
56
        self.run_bzr('commit -m fixing hello')
63
57
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
 
        self.assertTrue('\n+hello world!' in output)
65
 
        output = self.run_bzr('diff -c 3', retcode=1)[0]
66
 
        self.assertTrue('\n+hello world!' in output)
67
 
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
 
        self.assertTrue('\n+baz' in output)
69
 
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
 
        self.assertTrue('\n+baz' in output)
 
58
        self.assert_('\n+hello world!' in output)
 
59
        output = self.run_bzr('diff -r last:3..last:1',
 
60
                retcode=1)[0]
 
61
        self.assert_('\n+baz' in output)
71
62
        self.build_tree(['moo'])
72
 
        tree.add('moo')
 
63
        self.run_bzr('add moo')
73
64
        os.unlink('moo')
74
65
        self.run_bzr('diff')
75
66
 
76
67
    def test_diff_prefix(self):
77
68
        """diff --prefix appends to filenames in output"""
78
69
        self.make_example_branch()
79
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
70
        file('hello', 'wb').write('hello world!\n')
80
71
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
81
 
        self.assertEqual(err, '')
 
72
        self.assertEquals(err, '')
82
73
        self.assertEqualDiff(subst_dates(out), '''\
83
74
=== modified file 'hello'
84
75
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
98
89
    def test_diff_p1(self):
99
90
        """diff -p1 produces lkml-style diffs"""
100
91
        self.make_example_branch()
101
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
92
        file('hello', 'wb').write('hello world!\n')
102
93
        out, err = self.run_bzr('diff -p1', retcode=1)
103
 
        self.assertEqual(err, '')
 
94
        self.assertEquals(err, '')
104
95
        self.assertEqualDiff(subst_dates(out), '''\
105
96
=== modified file 'hello'
106
97
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
114
105
    def test_diff_p0(self):
115
106
        """diff -p0 produces diffs with no prefix"""
116
107
        self.make_example_branch()
117
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
108
        file('hello', 'wb').write('hello world!\n')
118
109
        out, err = self.run_bzr('diff -p0', retcode=1)
119
 
        self.assertEqual(err, '')
 
110
        self.assertEquals(err, '')
120
111
        self.assertEqualDiff(subst_dates(out), '''\
121
112
=== modified file 'hello'
122
113
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
131
122
        # Get an error from a file that does not exist at all
132
123
        # (Malone #3619)
133
124
        self.make_example_branch()
134
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
 
            error_regexes=('not versioned.*does-not-exist',))
 
125
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
 
126
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
136
127
 
137
128
    def test_diff_illegal_revision_specifiers(self):
138
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
139
 
            error_regexes=('one or two revision specifiers',))
140
 
 
141
 
    def test_diff_using_and_format(self):
142
 
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
143
 
            error_regexes=('are mutually exclusive',))
144
 
 
145
 
    def test_diff_nonexistent_revision(self):
146
 
        out, err = self.run_bzr('diff -r 123', retcode=3,
147
 
            error_regexes=("Requested revision: '123' does not "
148
 
                "exist in branch:",))
149
 
 
150
 
    def test_diff_nonexistent_dotted_revision(self):
151
 
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
152
 
        self.assertContainsRe(err,
153
 
            "Requested revision: '1.1' does not exist in branch:")
154
 
 
155
 
    def test_diff_nonexistent_dotted_revision_change(self):
156
 
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
157
 
        self.assertContainsRe(err,
158
 
            "Requested revision: '1.1' does not exist in branch:")
 
129
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
 
130
        self.assertContainsRe(err, 'one or two revision specifiers')
159
131
 
160
132
    def test_diff_unversioned(self):
161
133
        # Get an error when diffing a non-versioned file.
168
140
    # TODO: What should diff say for a file deleted in working tree?
169
141
 
170
142
    def example_branches(self):
171
 
        branch1_tree = self.make_branch_and_tree('branch1')
172
 
        self.build_tree(['branch1/file'], line_endings='binary')
173
 
        self.build_tree(['branch1/file2'], line_endings='binary')
174
 
        branch1_tree.add('file')
175
 
        branch1_tree.add('file2')
176
 
        branch1_tree.commit(message='add file and file2')
177
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
143
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
 
144
        self.run_bzr('init branch1')[0]
 
145
        self.run_bzr('add branch1/file')[0]
 
146
        self.run_bzr(['commit', '-m', 'add file', 'branch1'])
 
147
        self.run_bzr('branch branch1 branch2')[0]
178
148
        self.build_tree_contents([('branch2/file', 'new content\n')])
179
 
        branch2_tree.commit(message='update file')
180
 
        return branch1_tree, branch2_tree
 
149
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
181
150
 
182
 
    def check_b2_vs_b1(self, cmd):
183
 
        # Compare branch2 vs branch1 using cmd and check the result
184
 
        out, err = self.run_bzr(cmd, retcode=1)
185
 
        self.assertEqual('', err)
186
 
        self.assertEqual("=== modified file 'file'\n"
 
151
    def test_diff_branches(self):
 
152
        self.example_branches()
 
153
        # should open branch1 and diff against branch2, 
 
154
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
 
155
                                retcode=1)
 
156
        self.assertEquals('', err)
 
157
        self.assertEquals("=== modified file 'file'\n"
187
158
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
188
159
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
160
                          "@@ -1,1 +1,1 @@\n"
190
161
                          "-new content\n"
191
162
                          "+contents of branch1/file\n"
192
163
                          "\n", subst_dates(out))
193
 
 
194
 
    def check_b1_vs_b2(self, cmd):
195
 
        # Compare branch1 vs branch2 using cmd and check the result
196
 
        out, err = self.run_bzr(cmd, retcode=1)
197
 
        self.assertEqual('', err)
 
164
        out, err = self.run_bzr('diff branch2 branch1',
 
165
                                         retcode=1)
 
166
        self.assertEquals('', err)
198
167
        self.assertEqualDiff("=== modified file 'file'\n"
199
168
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
200
169
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
170
                              "@@ -1,1 +1,1 @@\n"
202
 
                              "-contents of branch1/file\n"
203
 
                              "+new content\n"
 
171
                              "-new content\n"
 
172
                              "+contents of branch1/file\n"
204
173
                              "\n", subst_dates(out))
205
174
 
206
 
    def check_no_diffs(self, cmd):
207
 
        # Check that running cmd returns an empty diff
208
 
        out, err = self.run_bzr(cmd, retcode=0)
209
 
        self.assertEqual('', err)
210
 
        self.assertEqual('', out)
211
 
 
212
 
    def test_diff_branches(self):
213
 
        self.example_branches()
214
 
        # should open branch1 and diff against branch2,
215
 
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
216
 
        # Compare two working trees using various syntax forms
217
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
218
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
219
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
220
 
        # Test with a selected file that was changed
221
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
222
 
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
223
 
        self.check_b2_vs_b1('diff branch2/file --new branch1')
224
 
        # Test with a selected file that was not changed
225
 
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
226
 
        self.check_no_diffs('diff --old branch2 branch1/file2')
227
 
        self.check_no_diffs('diff branch2/file2 --new branch1')
228
 
 
229
 
    def test_diff_branches_no_working_trees(self):
230
 
        branch1_tree, branch2_tree = self.example_branches()
231
 
        # Compare a working tree to a branch without a WT
232
 
        dir1 = branch1_tree.bzrdir
233
 
        dir1.destroy_workingtree()
234
 
        self.assertFalse(dir1.has_workingtree())
235
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
236
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
237
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
238
 
        # Compare a branch without a WT to one with a WT
239
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
240
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
241
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
242
 
        # Compare a branch with a WT against another without a WT
243
 
        dir2 = branch2_tree.bzrdir
244
 
        dir2.destroy_workingtree()
245
 
        self.assertFalse(dir2.has_workingtree())
246
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
247
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
248
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
249
 
 
250
175
    def test_diff_revno_branches(self):
251
176
        self.example_branches()
252
 
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
253
 
        self.build_tree_contents([('branch2/file', 'even newer content')])
254
 
        branch2_tree.commit(message='update file once more')
 
177
        print >> open('branch2/file', 'wb'), 'even newer content'
 
178
        self.run_bzr(['commit', '-m',
 
179
                      'update file once more', 'branch2'])
255
180
 
256
181
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
257
182
                                )
258
 
        self.assertEqual('', err)
259
 
        self.assertEqual('', out)
 
183
        self.assertEquals('', err)
 
184
        self.assertEquals('', out)
260
185
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
261
186
                                retcode=1)
262
 
        self.assertEqual('', err)
 
187
        self.assertEquals('', err)
263
188
        self.assertEqualDiff("=== modified file 'file'\n"
264
189
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
265
190
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
269
194
                              "\n", subst_dates(out))
270
195
 
271
196
    def example_branch2(self):
272
 
        branch1_tree = self.make_branch_and_tree('branch1')
273
 
        self.build_tree_contents([('branch1/file1', 'original line\n')])
274
 
        branch1_tree.add('file1')
275
 
        branch1_tree.commit(message='first commit')
276
 
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
277
 
        branch1_tree.commit(message='second commit')
278
 
        return branch1_tree
 
197
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
 
198
        self.run_bzr('init branch1')[0]
 
199
        self.run_bzr('add branch1/file1')[0]
 
200
        print >> open('branch1/file1', 'wb'), 'original line'
 
201
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
 
202
        
 
203
        print >> open('branch1/file1', 'wb'), 'repo line'
 
204
        self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
279
205
 
280
206
    def test_diff_to_working_tree(self):
281
207
        self.example_branch2()
282
 
        self.build_tree_contents([('branch1/file1', 'new line')])
283
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
284
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
285
 
 
286
 
    def test_diff_to_working_tree_in_subdir(self):
287
 
        self.example_branch2()
288
 
        self.build_tree_contents([('branch1/file1', 'new line')])
289
 
        os.mkdir('branch1/dir1')
290
 
        output = self.run_bzr('diff -r 1..', retcode=1,
291
 
                              working_dir='branch1/dir1')
292
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
208
        
 
209
        print >> open('branch1/file1', 'wb'), 'new line'
 
210
        output = self.run_bzr('diff -r 1.. branch1',
 
211
                              retcode=1)
 
212
        self.assertTrue('\n-original line\n+new line\n' in output[0])
293
213
 
294
214
    def test_diff_across_rename(self):
295
215
        """The working tree path should always be considered for diffing"""
296
 
        tree = self.make_example_branch()
 
216
        self.make_example_branch()
297
217
        self.run_bzr('diff -r 0..1 hello', retcode=1)
298
 
        tree.rename_one('hello', 'hello1')
 
218
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
219
        wt.rename_one('hello', 'hello1')
299
220
        self.run_bzr('diff hello1', retcode=1)
300
221
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
301
222
 
302
 
    def test_diff_to_branch_no_working_tree(self):
303
 
        branch1_tree = self.example_branch2()
304
 
        dir1 = branch1_tree.bzrdir
305
 
        dir1.destroy_workingtree()
306
 
        self.assertFalse(dir1.has_workingtree())
307
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
308
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
309
 
 
310
 
    def test_custom_format(self):
311
 
        class BooDiffTree(DiffTree):
312
 
 
313
 
            def show_diff(self, specific_files, extra_trees=None):
314
 
                self.to_file.write("BOO!\n")
315
 
                return super(BooDiffTree, self).show_diff(specific_files,
316
 
                    extra_trees)
317
 
 
318
 
        diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
319
 
        self.addCleanup(diff_format_registry.remove, "boo")
320
 
        self.make_example_branch()
321
 
        self.build_tree_contents([('hello', 'hello world!\n')])
322
 
        output = self.run_bzr('diff --format=boo', retcode=1)
323
 
        self.assertTrue("BOO!" in output[0])
324
 
        output = self.run_bzr('diff -Fboo', retcode=1)
325
 
        self.assertTrue("BOO!" in output[0])
326
 
 
327
223
 
328
224
class TestCheckoutDiff(TestDiff):
329
225
 
330
226
    def make_example_branch(self):
331
 
        tree = super(TestCheckoutDiff, self).make_example_branch()
332
 
        tree = tree.branch.create_checkout('checkout')
 
227
        super(TestCheckoutDiff, self).make_example_branch()
 
228
        self.run_bzr('checkout . checkout')
333
229
        os.chdir('checkout')
334
 
        return tree
335
230
 
336
231
    def example_branch2(self):
337
 
        tree = super(TestCheckoutDiff, self).example_branch2()
 
232
        super(TestCheckoutDiff, self).example_branch2()
338
233
        os.mkdir('checkouts')
339
 
        tree = tree.branch.create_checkout('checkouts/branch1')
 
234
        self.run_bzr('checkout branch1 checkouts/branch1')
340
235
        os.chdir('checkouts')
341
 
        return tree
342
236
 
343
237
    def example_branches(self):
344
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
345
 
                                           self).example_branches()
 
238
        super(TestCheckoutDiff, self).example_branches()
346
239
        os.mkdir('checkouts')
347
 
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
348
 
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
 
240
        self.run_bzr('checkout branch1 checkouts/branch1')
 
241
        self.run_bzr('checkout branch2 checkouts/branch2')
349
242
        os.chdir('checkouts')
350
 
        return branch1_tree, branch2_tree
351
243
 
352
244
 
353
245
class TestDiffLabels(DiffBase):
354
246
 
355
247
    def test_diff_label_removed(self):
356
 
        tree = super(TestDiffLabels, self).make_example_branch()
357
 
        tree.remove('hello', keep_files=False)
 
248
        super(TestDiffLabels, self).make_example_branch()
 
249
        self.run_bzr('remove hello')
358
250
        diff = self.run_bzr('diff', retcode=1)
359
251
        self.assertTrue("=== removed file 'hello'" in diff[0])
360
252
 
361
253
    def test_diff_label_added(self):
362
 
        tree = super(TestDiffLabels, self).make_example_branch()
363
 
        self.build_tree_contents([('barbar', 'barbar')])
364
 
        tree.add('barbar')
 
254
        super(TestDiffLabels, self).make_example_branch()
 
255
        file('barbar', 'wt').write('barbar')
 
256
        self.run_bzr('add barbar')
365
257
        diff = self.run_bzr('diff', retcode=1)
366
258
        self.assertTrue("=== added file 'barbar'" in diff[0])
367
259
 
368
260
    def test_diff_label_modified(self):
369
261
        super(TestDiffLabels, self).make_example_branch()
370
 
        self.build_tree_contents([('hello', 'barbar')])
 
262
        file('hello', 'wt').write('barbar')
371
263
        diff = self.run_bzr('diff', retcode=1)
372
264
        self.assertTrue("=== modified file 'hello'" in diff[0])
373
265
 
374
266
    def test_diff_label_renamed(self):
375
 
        tree = super(TestDiffLabels, self).make_example_branch()
376
 
        tree.rename_one('hello', 'gruezi')
 
267
        super(TestDiffLabels, self).make_example_branch()
 
268
        self.run_bzr('rename hello gruezi')
377
269
        diff = self.run_bzr('diff', retcode=1)
378
270
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
379
271
 
382
274
 
383
275
    def test_external_diff(self):
384
276
        """Test that we can spawn an external diff process"""
385
 
        self.disable_missing_extensions_warning()
386
277
        # We have to use run_bzr_subprocess, because we need to
387
278
        # test writing directly to stdout, (there was a bug in
388
279
        # subprocess.py that we had to workaround).
389
280
        # However, if 'diff' may not be available
390
281
        self.make_example_branch()
391
 
        out, err = self.run_bzr_subprocess(
392
 
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
393
 
            universal_newlines=True,
394
 
            retcode=None)
 
282
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
283
        try:
 
284
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
285
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
286
                                               '--diff-options', '-ub',
 
287
                                               universal_newlines=True,
 
288
                                               retcode=None)
 
289
        finally:
 
290
            if orig_progress is None:
 
291
                del os.environ['BZR_PROGRESS_BAR']
 
292
            else:
 
293
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
294
            
395
295
        if 'Diff is not installed on this machine' in err:
396
 
            raise tests.TestSkipped("No external 'diff' is available")
 
296
            raise TestSkipped("No external 'diff' is available")
397
297
        self.assertEqual('', err)
398
298
        # We have to skip the stuff in the middle, because it depends
399
299
        # on time.time()
403
303
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
404
304
                                 "+baz\n\n")
405
305
 
406
 
    def test_external_diff_options_and_using(self):
407
 
        """Test that the options are passed correctly to an external diff process"""
408
 
        self.requireFeature(features.diff_feature)
409
 
        self.make_example_branch()
410
 
        self.build_tree_contents([('hello', 'Foo\n')])
411
 
        out, err = self.run_bzr('diff --diff-options -i --using diff',
412
 
                                    retcode=1)
413
 
        self.assertEqual("=== modified file 'hello'\n", out)
414
 
        self.assertEqual('', err)
415
 
 
416
306
 
417
307
class TestDiffOutput(DiffBase):
418
308
 
419
309
    def test_diff_output(self):
420
310
        # check that output doesn't mangle line-endings
421
311
        self.make_example_branch()
422
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
312
        file('hello', 'wb').write('hello world!\n')
423
313
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
424
 
        self.assertTrue('\n+hello world!\n' in output)
 
314
        self.assert_('\n+hello world!\n' in output)