/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/per_workingtree/test_workingtree.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/per_workingtree/test_workingtree.py
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 
19
 
from cStringIO import StringIO
20
19
import errno
21
20
import os
22
21
 
23
 
from breezy import (
 
22
from ... import (
24
23
    branch,
25
24
    bzrdir,
26
25
    config,
33
32
    trace,
34
33
    urlutils,
35
34
    )
36
 
from breezy.errors import (
 
35
from ...errors import (
37
36
    UnsupportedOperation,
38
37
    PathsNotVersionedError,
39
38
    )
40
 
from breezy.inventory import Inventory
41
 
from breezy.mutabletree import MutableTree
42
 
from breezy.osutils import pathjoin, getcwd, has_symlinks
43
 
from breezy.tests import (
 
39
from ...inventory import Inventory
 
40
from ...mutabletree import MutableTree
 
41
from ...osutils import pathjoin, getcwd, has_symlinks
 
42
from ...sixish import (
 
43
    BytesIO,
 
44
    )
 
45
from .. import (
44
46
    features,
45
47
    TestSkipped,
46
48
    TestNotApplicable,
47
49
    )
48
 
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
49
 
from breezy.workingtree import (
 
50
from .  import TestCaseWithWorkingTree
 
51
from ...workingtree import (
50
52
    TreeDirectory,
51
53
    TreeFile,
52
54
    TreeLink,
53
55
    InventoryWorkingTree,
54
56
    WorkingTree,
55
57
    )
56
 
from breezy.conflicts import ConflictList, TextConflict, ContentsConflict
 
58
from ...conflicts import ConflictList, TextConflict, ContentsConflict
57
59
 
58
60
 
59
61
class TestWorkingTree(TestCaseWithWorkingTree):
318
320
        self.build_tree(['hello'])
319
321
        wt.add(['hello'])
320
322
        wt.commit(message='add hello')
321
 
        stdout = StringIO()
322
 
        stderr = StringIO()
 
323
        stdout = BytesIO()
 
324
        stderr = BytesIO()
323
325
        self.assertEqual(None, self.apply_redirected(None, stdout, stderr,
324
326
                                                     wt.remove,
325
327
                                                     ['hello'],
882
884
        tree.lock_read()
883
885
        self.addCleanup(tree.unlock)
884
886
        self.assertEqual(
885
 
            set(['not-here-and-not-versioned', 'here-and-not-versioned']),
 
887
            {'not-here-and-not-versioned', 'here-and-not-versioned'},
886
888
            tree.filter_unversioned_files(paths))
887
889
 
888
890
    def test_detect_real_kind(self):
986
988
                self.assertFalse(tree.is_executable(tree.path2id('filename')))
987
989
            finally:
988
990
                tree.unlock()
989
 
            os.chmod('filename', 0755)
 
991
            os.chmod('filename', 0o755)
990
992
            self.addCleanup(tree.lock_read().unlock)
991
993
            self.assertTrue(tree.is_executable(tree.path2id('filename')))
992
994
        else:
1000
1002
        self.build_tree(['tree/a', 'tree/b'])
1001
1003
        tree.add(['a', 'b'], ['a-id', 'b-id'])
1002
1004
        os.unlink('tree/a')
1003
 
        self.assertEqual(set(['a-id', 'b-id', tree.get_root_id()]),
 
1005
        self.assertEqual({'a-id', 'b-id', tree.get_root_id()},
1004
1006
                         tree.all_file_ids())
1005
1007
 
1006
1008
    def test_sprout_hardlink(self):