/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/test_smart_add.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_smart_add.py
17
17
from .. import (
18
18
    add,
19
19
    cache_utf8,
20
 
    osutils,
21
20
    tests,
22
21
    )
23
22
from ..bzr import (
49
48
                         'base/dir/', 'base/dir/a',
50
49
                         'base/dir/subdir/',
51
50
                         'base/dir/subdir/b',
52
 
                        ])
 
51
                         ])
53
52
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
54
53
                            'dir/subdir', 'dir/subdir/b'])
55
54
        self.base_tree.commit('creating initial tree.')
78
77
                 'dir/', 'dir/a',
79
78
                 'dir/subdir/',
80
79
                 'dir/subdir/b',
81
 
                ]
 
80
                 ]
82
81
        self.build_tree(['new/' + fn for fn in files])
83
82
        self.add_helper(self.base_tree, '', new_tree, ['new'])
84
83
 
159
158
        action = add.AddAction(to_file=stdout, should_print=bool(output))
160
159
 
161
160
        self.apply_redirected(None, stdout, None, action, inv, None,
162
 
            'path', 'file')
 
161
                              'path', 'file')
163
162
        self.assertEqual(stdout.getvalue(), output)