/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 breezy/tests/blackbox/test_status.py

  • Committer: Breezy landing bot
  • Author(s): Gustav Hartvigsson
  • Date: 2021-01-10 18:46:30 UTC
  • mfrom: (7526.1.1 brz-removed-api-doc)
  • mto: This revision was merged to the branch mainline in revision 7532.
  • Revision ID: breezy.the.bot@gmail.com-20210110184630-dxu0g9dqq020uiw6
Drop documentation for removed API API.

Merged from https://code.launchpad.net/~gustav-hartvigsson/brz/removed-api-doc/+merge/396033

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_status.py
31
31
import sys
32
32
 
33
33
from ... import (
34
 
    conflicts,
35
34
    errors,
36
35
    osutils,
37
36
    status,
38
37
    )
39
38
from breezy.bzr import (
40
39
    bzrdir,
 
40
    conflicts,
41
41
    )
42
42
import breezy.branch
43
43
from ...osutils import pathjoin
297
297
        self.build_tree(['dir2/'])
298
298
        tree.add('dir2')
299
299
        tree.commit('added dir2')
300
 
        tree.set_conflicts(conflicts.ConflictList(
301
 
            [conflicts.ContentsConflict('foo')]))
 
300
        tree.set_conflicts([conflicts.ContentsConflict('foo')])
302
301
        tof = BytesIO()
303
302
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
304
303
        self.assertEqualDiff(b'', tof.getvalue())
305
 
        tree.set_conflicts(conflicts.ConflictList(
306
 
            [conflicts.ContentsConflict('dir2')]))
 
304
        tree.set_conflicts([conflicts.ContentsConflict('dir2')])
307
305
        tof = StringIO()
308
306
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
309
307
        self.assertEqualDiff('conflicts:\n  Contents conflict in dir2\n',
310
308
                             tof.getvalue())
311
309
 
312
 
        tree.set_conflicts(conflicts.ConflictList(
313
 
            [conflicts.ContentsConflict('dir2/file1')]))
 
310
        tree.set_conflicts([conflicts.ContentsConflict('dir2/file1')])
314
311
        tof = StringIO()
315
312
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
316
313
        self.assertEqualDiff('conflicts:\n  Contents conflict in dir2/file1\n',