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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-01 02:49:14 UTC
  • mfrom: (7045.4.39 python3-u)
  • Revision ID: breezy.the.bot@gmail.com-20180801024914-vib3fpfkn36585ie
Fix some more tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-u/+merge/351386

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.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
import codecs
17
18
import errno
18
19
import os
19
20
import sys
1768
1769
        self.assertEqual(this.wt.get_file('i.OTHER').read(),
1769
1770
                         b'h\ni\nj\nk\n')
1770
1771
        self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1771
 
        modified = ['a', 'b', 'c', 'h', 'i']
 
1772
        modified = [b'a', b'b', b'c', b'h', b'i']
1772
1773
        merge_modified = this.wt.merge_modified()
1773
1774
        self.assertSubset(merge_modified, modified)
1774
1775
        self.assertEqual(len(merge_modified), len(modified))
1775
 
        with open(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write(b'booga')
 
1776
        with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f: f.write(b'booga')
1776
1777
        modified.pop(0)
1777
1778
        merge_modified = this.wt.merge_modified()
1778
1779
        self.assertSubset(merge_modified, modified)
2188
2189
            filters._reset_registry(original_registry)
2189
2190
        self.addCleanup(restore_registry)
2190
2191
        def rot13(chunks, context=None):
2191
 
            return [b''.join(chunks).encode('rot13')]
 
2192
            return [codecs.encode(chunk.decode('ascii'), 'rot13').encode('ascii')
 
2193
                    for chunk in chunks]
2192
2194
        rot13filter = filters.ContentFilter(rot13, rot13)
2193
2195
        filters.filter_stacks_registry.register(
2194
2196
            'rot13', {'yes': [rot13filter]}.get)