← 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

Test ConnectionError exceptions.

* bzrlib/transport/http/_urllib2_wrappers.py
(AbstractHTTPConnection.getresponse): Not needed anymore.
(AbstractHTTPHandler.do_open): Better exception handling.
(HTTPBasicAuthHandler): Not yet implemented.

* bzrlib/transport/http/_urllib.py: 
Fix spurious spaces.

* bzrlib/transport/http/__init__.py:
(WallRequestHandler, WallHttpServer): A http server closing
connections as soon as a request arrives.

* bzrlib/tests/test_http.py:
(TestWallServer): Check exceptions during connection.

* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithWallserver): New class. A server which close
connections as soon as possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2012 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by 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):
43
 
    """Base class with common setup method"""
 
37
class TestDiff(ExternalBase):
44
38
 
45
39
    def make_example_branch(self):
 
40
        # FIXME: copied from test_too_much -- share elsewhere?
46
41
        tree = self.make_branch_and_tree('.')
47
 
        self.build_tree_contents([
48
 
            ('hello', 'foo\n'),
49
 
            ('goodbye', 'baz\n')])
 
42
        open('hello', 'wb').write('foo\n')
50
43
        tree.add(['hello'])
51
44
        tree.commit('setup')
 
45
        open('goodbye', 'wb').write('baz\n')
52
46
        tree.add(['goodbye'])
53
47
        tree.commit('setup')
54
 
        return tree
55
 
 
56
 
 
57
 
class TestDiff(DiffBase):
58
48
 
59
49
    def test_diff(self):
60
 
        tree = self.make_example_branch()
61
 
        self.build_tree_contents([('hello', 'hello world!')])
62
 
        tree.commit(message='fixing hello')
63
 
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
 
        self.assert_('\n+hello world!' in output)
65
 
        output = self.run_bzr('diff -c 3', retcode=1)[0]
66
 
        self.assert_('\n+hello world!' in output)
67
 
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
 
        self.assert_('\n+baz' in output)
69
 
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
 
        self.assert_('\n+baz' in output)
71
 
        self.build_tree(['moo'])
72
 
        tree.add('moo')
 
50
        self.make_example_branch()
 
51
        file('hello', 'wt').write('hello world!')
 
52
        self.runbzr('commit -m fixing hello')
 
53
        output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
 
54
        self.assert_('\n+hello world!' in output)
 
55
        output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
 
56
        self.assert_('\n+baz' in output)
 
57
        file('moo', 'wb').write('moo')
 
58
        self.runbzr('add moo')
73
59
        os.unlink('moo')
74
 
        self.run_bzr('diff')
 
60
        self.runbzr('diff')
75
61
 
76
62
    def test_diff_prefix(self):
77
63
        """diff --prefix appends to filenames in output"""
78
64
        self.make_example_branch()
79
 
        self.build_tree_contents([('hello', 'hello world!\n')])
80
 
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
 
65
        file('hello', 'wb').write('hello world!\n')
 
66
        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
81
67
        self.assertEquals(err, '')
82
68
        self.assertEqualDiff(subst_dates(out), '''\
83
69
=== modified file 'hello'
89
75
 
90
76
''')
91
77
 
92
 
    def test_diff_illegal_prefix_value(self):
93
 
        # There was an error in error reporting for this option
94
 
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
95
 
        self.assertContainsRe(err,
96
 
            '--prefix expects two values separated by a colon')
97
 
 
98
78
    def test_diff_p1(self):
99
79
        """diff -p1 produces lkml-style diffs"""
100
80
        self.make_example_branch()
101
 
        self.build_tree_contents([('hello', 'hello world!\n')])
102
 
        out, err = self.run_bzr('diff -p1', retcode=1)
 
81
        file('hello', 'wb').write('hello world!\n')
 
82
        out, err = self.runbzr('diff -p1', retcode=1)
103
83
        self.assertEquals(err, '')
104
84
        self.assertEqualDiff(subst_dates(out), '''\
105
85
=== modified file 'hello'
114
94
    def test_diff_p0(self):
115
95
        """diff -p0 produces diffs with no prefix"""
116
96
        self.make_example_branch()
117
 
        self.build_tree_contents([('hello', 'hello world!\n')])
118
 
        out, err = self.run_bzr('diff -p0', retcode=1)
 
97
        file('hello', 'wb').write('hello world!\n')
 
98
        out, err = self.runbzr('diff -p0', retcode=1)
119
99
        self.assertEquals(err, '')
120
100
        self.assertEqualDiff(subst_dates(out), '''\
121
101
=== modified file 'hello'
131
111
        # Get an error from a file that does not exist at all
132
112
        # (Malone #3619)
133
113
        self.make_example_branch()
134
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
 
            error_regexes=('not versioned.*does-not-exist',))
136
 
 
137
 
    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:")
 
114
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
115
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
159
116
 
160
117
    def test_diff_unversioned(self):
161
118
        # Get an error when diffing a non-versioned file.
162
119
        # (Malone #3619)
163
120
        self.make_example_branch()
164
121
        self.build_tree(['unversioned-file'])
165
 
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
 
122
        out, err = self.runbzr('diff unversioned-file', retcode=3)
166
123
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
167
124
 
168
125
    # TODO: What should diff say for a file deleted in working tree?
169
126
 
170
127
    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()
178
 
        self.build_tree_contents([('branch2/file', 'new content\n')])
179
 
        branch2_tree.commit(message='update file')
180
 
        return branch1_tree, branch2_tree
 
128
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
 
129
        self.capture('init branch1')
 
130
        self.capture('add branch1/file')
 
131
        self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
 
132
        self.capture('branch branch1 branch2')
 
133
        print >> open('branch2/file', 'wb'), 'new content'
 
134
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
181
135
 
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)
 
136
    def test_diff_branches(self):
 
137
        self.example_branches()
 
138
        # should open branch1 and diff against branch2, 
 
139
        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
 
140
                                          'branch1'],
 
141
                                         retcode=1)
185
142
        self.assertEquals('', err)
186
143
        self.assertEquals("=== modified file 'file'\n"
187
144
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
190
147
                          "-new content\n"
191
148
                          "+contents of branch1/file\n"
192
149
                          "\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)
 
150
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
151
                                         retcode=1)
197
152
        self.assertEquals('', err)
198
153
        self.assertEqualDiff("=== modified file 'file'\n"
199
154
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
200
155
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
156
                              "@@ -1,1 +1,1 @@\n"
202
 
                              "-contents of branch1/file\n"
203
 
                              "+new content\n"
 
157
                              "-new content\n"
 
158
                              "+contents of branch1/file\n"
204
159
                              "\n", subst_dates(out))
205
160
 
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.assertEquals('', err)
210
 
        self.assertEquals('', 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
161
    def test_diff_revno_branches(self):
251
162
        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')
 
163
        print >> open('branch2/file', 'wb'), 'even newer content'
 
164
        self.run_bzr_captured(['commit', '-m', 
 
165
                               'update file once more', 'branch2'])
255
166
 
256
 
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
257
 
                                )
 
167
        out, err = self.run_bzr_captured(['diff', '-r',
 
168
                                          'revno:1:branch2..revno:1:branch1'],
 
169
                                         retcode=0)
258
170
        self.assertEquals('', err)
259
171
        self.assertEquals('', out)
260
 
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
261
 
                                retcode=1)
 
172
        out, err = self.run_bzr_captured(['diff', '-r', 
 
173
                                          'revno:2:branch2..revno:1:branch1'],
 
174
                                         retcode=1)
262
175
        self.assertEquals('', err)
263
176
        self.assertEqualDiff("=== modified file 'file'\n"
264
177
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
269
182
                              "\n", subst_dates(out))
270
183
 
271
184
    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
 
185
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
 
186
        self.capture('init branch1')
 
187
        self.capture('add branch1/file1')
 
188
        print >> open('branch1/file1', 'wb'), 'original line'
 
189
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
190
        
 
191
        print >> open('branch1/file1', 'wb'), 'repo line'
 
192
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
279
193
 
280
194
    def test_diff_to_working_tree(self):
281
195
        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')
 
196
        
 
197
        print >> open('branch1/file1', 'wb'), 'new line'
 
198
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
 
199
                                       retcode=1)
 
200
        self.assertTrue('\n-original line\n+new line\n' in output[0])
293
201
 
294
202
    def test_diff_across_rename(self):
295
203
        """The working tree path should always be considered for diffing"""
296
 
        tree = self.make_example_branch()
297
 
        self.run_bzr('diff -r 0..1 hello', retcode=1)
298
 
        tree.rename_one('hello', 'hello1')
299
 
        self.run_bzr('diff hello1', retcode=1)
300
 
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
301
 
 
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
204
        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])
 
205
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
206
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
207
        wt.rename_one('hello', 'hello1')
 
208
        self.run_bzr('diff', 'hello1', retcode=1)
 
209
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
326
210
 
327
211
 
328
212
class TestCheckoutDiff(TestDiff):
329
213
 
330
214
    def make_example_branch(self):
331
 
        tree = super(TestCheckoutDiff, self).make_example_branch()
332
 
        tree = tree.branch.create_checkout('checkout')
 
215
        super(TestCheckoutDiff, self).make_example_branch()
 
216
        self.runbzr('checkout . checkout')
333
217
        os.chdir('checkout')
334
 
        return tree
335
218
 
336
219
    def example_branch2(self):
337
 
        tree = super(TestCheckoutDiff, self).example_branch2()
 
220
        super(TestCheckoutDiff, self).example_branch2()
338
221
        os.mkdir('checkouts')
339
 
        tree = tree.branch.create_checkout('checkouts/branch1')
 
222
        self.runbzr('checkout branch1 checkouts/branch1')
340
223
        os.chdir('checkouts')
341
 
        return tree
342
224
 
343
225
    def example_branches(self):
344
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
345
 
                                           self).example_branches()
 
226
        super(TestCheckoutDiff, self).example_branches()
346
227
        os.mkdir('checkouts')
347
 
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
348
 
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
 
228
        self.runbzr('checkout branch1 checkouts/branch1')
 
229
        self.runbzr('checkout branch2 checkouts/branch2')
349
230
        os.chdir('checkouts')
350
 
        return branch1_tree, branch2_tree
351
 
 
352
 
 
353
 
class TestDiffLabels(DiffBase):
 
231
 
 
232
 
 
233
class TestDiffLabels(TestDiff):
354
234
 
355
235
    def test_diff_label_removed(self):
356
 
        tree = super(TestDiffLabels, self).make_example_branch()
357
 
        tree.remove('hello', keep_files=False)
358
 
        diff = self.run_bzr('diff', retcode=1)
 
236
        super(TestDiffLabels, self).make_example_branch()
 
237
        self.runbzr('remove hello')
 
238
        diff = self.run_bzr_captured(['diff'], retcode=1)
359
239
        self.assertTrue("=== removed file 'hello'" in diff[0])
360
240
 
361
241
    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')
365
 
        diff = self.run_bzr('diff', retcode=1)
 
242
        super(TestDiffLabels, self).make_example_branch()
 
243
        file('barbar', 'wt').write('barbar')
 
244
        self.runbzr('add barbar')
 
245
        diff = self.run_bzr_captured(['diff'], retcode=1)
366
246
        self.assertTrue("=== added file 'barbar'" in diff[0])
367
247
 
368
248
    def test_diff_label_modified(self):
369
249
        super(TestDiffLabels, self).make_example_branch()
370
 
        self.build_tree_contents([('hello', 'barbar')])
371
 
        diff = self.run_bzr('diff', retcode=1)
 
250
        file('hello', 'wt').write('barbar')
 
251
        diff = self.run_bzr_captured(['diff'], retcode=1)
372
252
        self.assertTrue("=== modified file 'hello'" in diff[0])
373
253
 
374
254
    def test_diff_label_renamed(self):
375
 
        tree = super(TestDiffLabels, self).make_example_branch()
376
 
        tree.rename_one('hello', 'gruezi')
377
 
        diff = self.run_bzr('diff', retcode=1)
 
255
        super(TestDiffLabels, self).make_example_branch()
 
256
        self.runbzr('rename hello gruezi')
 
257
        diff = self.run_bzr_captured(['diff'], retcode=1)
378
258
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
379
259
 
380
260
 
381
 
class TestExternalDiff(DiffBase):
 
261
class TestExternalDiff(TestDiff):
382
262
 
383
263
    def test_external_diff(self):
384
264
        """Test that we can spawn an external diff process"""
385
 
        self.disable_missing_extensions_warning()
386
265
        # We have to use run_bzr_subprocess, because we need to
387
266
        # test writing directly to stdout, (there was a bug in
388
267
        # subprocess.py that we had to workaround).
389
268
        # However, if 'diff' may not be available
390
269
        self.make_example_branch()
391
 
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
392
 
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
393
 
                                           universal_newlines=True,
394
 
                                           retcode=None)
 
270
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
271
        try:
 
272
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
273
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
274
                                               '--diff-options', '-ub',
 
275
                                               retcode=None)
 
276
        finally:
 
277
            if orig_progress is None:
 
278
                del os.environ['BZR_PROGRESS_BAR']
 
279
            else:
 
280
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
281
            
395
282
        if 'Diff is not installed on this machine' in err:
396
 
            raise tests.TestSkipped("No external 'diff' is available")
 
283
            raise TestSkipped("No external 'diff' is available")
397
284
        self.assertEqual('', err)
398
285
        # We have to skip the stuff in the middle, because it depends
399
286
        # on time.time()
402
289
                                   "+++ goodbye\t")
403
290
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
404
291
                                 "+baz\n\n")
405
 
 
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.assertEquals("=== modified file 'hello'\n", out)
414
 
        self.assertEquals('', err)
415
 
 
416
 
 
417
 
class TestDiffOutput(DiffBase):
418
 
 
419
 
    def test_diff_output(self):
420
 
        # check that output doesn't mangle line-endings
421
 
        self.make_example_branch()
422
 
        self.build_tree_contents([('hello', 'hello world!\n')])
423
 
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
424
 
        self.assert_('\n+hello world!\n' in output)