/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-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_smart_add.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from cStringIO import StringIO
18
 
 
19
 
from bzrlib import (
 
17
from .. import (
20
18
    add,
21
 
    inventory,
 
19
    cache_utf8,
22
20
    osutils,
23
21
    tests,
24
22
    )
 
23
from ..bzr import (
 
24
    inventory,
 
25
    )
 
26
from ..sixish import (
 
27
    StringIO,
 
28
    )
25
29
 
26
30
 
27
31
class AddCustomIDAction(add.AddAction):
29
33
    def __call__(self, inv, parent_ie, path, kind):
30
34
        # The first part just logs if appropriate
31
35
        # Now generate a custom id
32
 
        file_id = osutils.safe_file_id(kind + '-'
33
 
                                       + path.raw_path.replace('/', '%'),
34
 
                                       warn=False)
 
36
        file_id = cache_utf8.encode(kind + '-' + path.replace('/', '%'))
35
37
        if self.should_print:
36
38
            self._to_file.write('added %s with id %s\n'
37
 
                                % (path.raw_path, file_id))
 
39
                                % (path, file_id))
38
40
        return file_id
39
41
 
40
42
 
115
117
        self.assertNotEqual(None, c_id)
116
118
        self.base_tree.lock_read()
117
119
        self.addCleanup(self.base_tree.unlock)
118
 
        self.failIf(c_id in self.base_tree)
 
120
        self.assertFalse(self.base_tree.has_id(c_id))
119
121
 
120
122
        d_id = new_tree.path2id('subdir/d')
121
123
        self.assertNotEqual(None, d_id)
122
 
        self.failIf(d_id in self.base_tree)
 
124
        self.assertFalse(self.base_tree.has_id(d_id))
123
125
 
124
126
    def test_copy_existing_dir(self):
125
127
        self.make_base_tree()
140
142
        self.assertNotEqual(None, a_id)
141
143
        self.base_tree.lock_read()
142
144
        self.addCleanup(self.base_tree.unlock)
143
 
        self.failIf(a_id in self.base_tree)
 
145
        self.assertFalse(self.base_tree.has_id(a_id))
144
146
 
145
147
 
146
148
class TestAddActions(tests.TestCase):
152
154
        self.run_action("adding path\n")
153
155
 
154
156
    def run_action(self, output):
155
 
        from bzrlib.mutabletree import _FastPath
156
157
        inv = inventory.Inventory()
157
158
        stdout = StringIO()
158
159
        action = add.AddAction(to_file=stdout, should_print=bool(output))
159
160
 
160
161
        self.apply_redirected(None, stdout, None, action, inv, None,
161
 
            _FastPath('path'), 'file')
 
162
            'path', 'file')
162
163
        self.assertEqual(stdout.getvalue(), output)