/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/workingtree_implementations/test_workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
19
19
import os
20
20
import sys
21
21
 
22
 
from bzrlib import ignores
23
22
import bzrlib
24
23
from bzrlib import branch, bzrdir, errors, osutils, urlutils, workingtree
25
24
from bzrlib.errors import (NotBranchError, NotVersionedError,
49
48
 
50
49
    def test_list_files_sorted(self):
51
50
        tree = self.make_branch_and_tree('.')
52
 
        ignores._set_user_ignores(['./.bazaar'])
53
51
        self.build_tree(['dir/', 'file', 'dir/file', 'dir/b',
54
52
                         'dir/subdir/', 'a', 'dir/subfile',
55
53
                         'zz_dir/', 'zz_dir/subfile'])
56
54
        files = [(path, kind) for (path, v, kind, file_id, entry)
57
55
                               in tree.list_files()]
58
56
        self.assertEqual([
59
 
            ('.bazaar', 'directory'),
60
57
            ('a', 'file'),
61
58
            ('dir', 'directory'),
62
59
            ('file', 'file'),
67
64
        files = [(path, kind) for (path, v, kind, file_id, entry)
68
65
                               in tree.list_files()]
69
66
        self.assertEqual([
70
 
            ('.bazaar', 'directory'),
71
67
            ('a', 'file'),
72
68
            ('dir', 'directory'),
73
69
            ('dir/b', 'file'),