/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_eol_conversion.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
"""Tests for eol conversion."""
18
18
 
19
19
import sys
20
 
from cStringIO import StringIO
21
20
 
22
 
from bzrlib import rules, status
23
 
from bzrlib.tests import TestSkipped
24
 
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
25
 
from bzrlib.workingtree import WorkingTree
 
21
from ... import rules, status
 
22
from ...sixish import (
 
23
    BytesIO,
 
24
    )
 
25
from .. import TestSkipped
 
26
from . import TestCaseWithWorkingTree
 
27
from ...workingtree import WorkingTree
26
28
 
27
29
 
28
30
# Sample files
97
99
            self.assertEqual(expected_unix, content)
98
100
        # Confirm that status thinks nothing has changed if the text roundtrips
99
101
        if roundtrip:
100
 
            status_io = StringIO()
 
102
            status_io = BytesIO()
101
103
            status.show_tree_status(wt2, to_file=status_io)
102
104
            self.assertEqual('', status_io.getvalue())
103
105