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

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_osutils.py
47
47
from .scenarios import load_tests_apply_scenarios
48
48
 
49
49
 
50
 
class _UTF8DirReaderFeature(features.Feature):
 
50
class _UTF8DirReaderFeature(features.ModuleAvailableFeature):
51
51
 
52
52
    def _probe(self):
53
53
        try:
54
54
            from .. import _readdir_pyx
 
55
            self._module = _readdir_pyx
55
56
            self.reader = _readdir_pyx.UTF8DirReader
56
57
            return True
57
58
        except ImportError:
58
59
            return False
59
60
 
60
 
    def feature_name(self):
61
 
        return 'breezy._readdir_pyx'
62
 
 
63
 
UTF8DirReaderFeature = features.ModuleAvailableFeature('breezy._readdir_pyx')
 
61
UTF8DirReaderFeature = _UTF8DirReaderFeature('breezy._readdir_pyx')
64
62
 
65
63
term_ios_feature = features.ModuleAvailableFeature('termios')
66
64
 
1185
1183
        self.assertEqual('./test-unreadable', e.filename)
1186
1184
        self.assertEqual(errno.EACCES, e.errno)
1187
1185
        # Ensure the message contains the file name
1188
 
        self.assertContainsRe(str(e), "\./test-unreadable")
 
1186
        self.assertContainsRe(str(e), "\\./test-unreadable")
1189
1187
 
1190
1188
 
1191
1189
    def test_walkdirs_encoding_error(self):
1670
1668
            processed_files.append(('d', from_path, to_path))
1671
1669
        def link_handler(from_path, to_path):
1672
1670
            processed_links.append((from_path, to_path))
1673
 
        handlers = {'file':file_handler,
1674
 
                    'directory':dir_handler,
1675
 
                    'symlink':link_handler,
 
1671
        handlers = {'file': file_handler,
 
1672
                    'directory': dir_handler,
 
1673
                    'symlink': link_handler,
1676
1674
                   }
1677
1675
 
1678
1676
        self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])
1743
1741
class TestSizeShaFile(tests.TestCaseInTempDir):
1744
1742
 
1745
1743
    def test_sha_empty(self):
1746
 
        self.build_tree_contents([('foo', '')])
 
1744
        self.build_tree_contents([('foo', b'')])
1747
1745
        expected_sha = osutils.sha_string('')
1748
1746
        f = open('foo')
1749
1747
        self.addCleanup(f.close)
1752
1750
        self.assertEqual(expected_sha, sha)
1753
1751
 
1754
1752
    def test_sha_mixed_endings(self):
1755
 
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
 
1753
        text = b'test\r\nwith\nall\rpossible line endings\r\n'
1756
1754
        self.build_tree_contents([('foo', text)])
1757
1755
        expected_sha = osutils.sha_string(text)
1758
1756
        f = open('foo', 'rb')
1765
1763
class TestShaFileByName(tests.TestCaseInTempDir):
1766
1764
 
1767
1765
    def test_sha_empty(self):
1768
 
        self.build_tree_contents([('foo', '')])
 
1766
        self.build_tree_contents([('foo', b'')])
1769
1767
        expected_sha = osutils.sha_string('')
1770
1768
        self.assertEqual(expected_sha, osutils.sha_file_by_name('foo'))
1771
1769
 
1772
1770
    def test_sha_mixed_endings(self):
1773
 
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
 
1771
        text = b'test\r\nwith\nall\rpossible line endings\r\n'
1774
1772
        self.build_tree_contents([('foo', text)])
1775
1773
        expected_sha = osutils.sha_string(text)
1776
1774
        self.assertEqual(expected_sha, osutils.sha_file_by_name('foo'))