/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 bzrlib/tests/test_textfile.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textfile.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 StringIO import StringIO
17
18
 
18
 
from ..errors import BinaryFile
19
 
from ..sixish import (
20
 
    BytesIO,
21
 
    )
22
 
from . import TestCase, TestCaseInTempDir
23
 
from ..textfile import text_file, check_text_lines, check_text_path
 
19
from bzrlib.errors import BinaryFile
 
20
from bzrlib.tests import TestCase, TestCaseInTempDir
 
21
from bzrlib.textfile import text_file, check_text_lines, check_text_path
24
22
 
25
23
 
26
24
class TextFile(TestCase):
27
25
 
28
26
    def test_text_file(self):
29
 
        s = BytesIO(b'ab' * 2048)
 
27
        s = StringIO('ab' * 2048)
30
28
        self.assertEqual(text_file(s).read(), s.getvalue())
31
 
        s = BytesIO(b'a' * 1023 + b'\x00')
 
29
        s = StringIO('a' * 1023 + '\x00')
32
30
        self.assertRaises(BinaryFile, text_file, s)
33
 
        s = BytesIO(b'a' * 1024 + b'\x00')
 
31
        s = StringIO('a' * 1024 + '\x00')
34
32
        self.assertEqual(text_file(s).read(), s.getvalue())
35
33
 
36
34
    def test_check_text_lines(self):
37
 
        lines = [b'ab' * 2048]
 
35
        lines = ['ab' * 2048]
38
36
        check_text_lines(lines)
39
 
        lines = [b'a' * 1023 + b'\x00']
 
37
        lines = ['a' * 1023 + '\x00']
40
38
        self.assertRaises(BinaryFile, check_text_lines, lines)
41
39
 
42
40
 
43
41
class TextPath(TestCaseInTempDir):
44
42
 
45
43
    def test_text_file(self):
46
 
        with open('boo', 'wb') as f:
47
 
            f.write(b'ab' * 2048)
 
44
        file('boo', 'wb').write('ab' * 2048)
48
45
        check_text_path('boo')
49
 
        with open('boo', 'wb') as f:
50
 
            f.write(b'a' * 1023 + b'\x00')
 
46
        file('boo', 'wb').write('a' * 1023 + '\x00')
51
47
        self.assertRaises(BinaryFile, check_text_path, 'boo')