/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: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

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
19
    inventory,
22
20
    osutils,
23
21
    tests,
24
22
    )
 
23
from ..sixish import (
 
24
    BytesIO,
 
25
    )
25
26
 
26
27
 
27
28
class AddCustomIDAction(add.AddAction):
30
31
        # The first part just logs if appropriate
31
32
        # Now generate a custom id
32
33
        file_id = osutils.safe_file_id(kind + '-'
33
 
                                       + path.raw_path.replace('/', '%'),
 
34
                                       + path.replace('/', '%'),
34
35
                                       warn=False)
35
36
        if self.should_print:
36
37
            self._to_file.write('added %s with id %s\n'
37
 
                                % (path.raw_path, file_id))
 
38
                                % (path, file_id))
38
39
        return file_id
39
40
 
40
41
 
54
55
 
55
56
    def add_helper(self, base_tree, base_path, new_tree, file_list,
56
57
                   should_print=False):
57
 
        to_file = StringIO()
 
58
        to_file = BytesIO()
58
59
        base_tree.lock_read()
59
60
        try:
60
61
            new_tree.lock_write()
115
116
        self.assertNotEqual(None, c_id)
116
117
        self.base_tree.lock_read()
117
118
        self.addCleanup(self.base_tree.unlock)
118
 
        self.failIf(c_id in self.base_tree)
 
119
        self.assertFalse(self.base_tree.has_id(c_id))
119
120
 
120
121
        d_id = new_tree.path2id('subdir/d')
121
122
        self.assertNotEqual(None, d_id)
122
 
        self.failIf(d_id in self.base_tree)
 
123
        self.assertFalse(self.base_tree.has_id(d_id))
123
124
 
124
125
    def test_copy_existing_dir(self):
125
126
        self.make_base_tree()
140
141
        self.assertNotEqual(None, a_id)
141
142
        self.base_tree.lock_read()
142
143
        self.addCleanup(self.base_tree.unlock)
143
 
        self.failIf(a_id in self.base_tree)
 
144
        self.assertFalse(self.base_tree.has_id(a_id))
144
145
 
145
146
 
146
147
class TestAddActions(tests.TestCase):
152
153
        self.run_action("adding path\n")
153
154
 
154
155
    def run_action(self, output):
155
 
        from bzrlib.mutabletree import _FastPath
156
156
        inv = inventory.Inventory()
157
 
        stdout = StringIO()
 
157
        stdout = BytesIO()
158
158
        action = add.AddAction(to_file=stdout, should_print=bool(output))
159
159
 
160
160
        self.apply_redirected(None, stdout, None, action, inv, None,
161
 
            _FastPath('path'), 'file')
 
161
            'path', 'file')
162
162
        self.assertEqual(stdout.getvalue(), output)