← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ls.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:27:55 UTC
  • mfrom: (5017.3.46 test-servers)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092755-3vvu4vbwiwjjte3s
Move tests servers from bzrlib.transport to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""External tests of 'bzr ls'"""
18
18
 
26
26
 
27
27
    def setUp(self):
28
28
        super(TestLS, self).setUp()
29
 
        
 
29
 
30
30
        # Create a simple branch that can be used in testing
31
31
        ignores._set_user_ignores(['user-ignore'])
32
32
 
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None):
 
39
    def ls_equals(self, value, args=None, recursive=True):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
 
43
        if recursive:
 
44
            command += ' -R'
43
45
        out, err = self.run_bzr(command)
44
46
        self.assertEqual('', err)
45
47
        self.assertEqualDiff(value, out)
52
54
    def test_ls_basic(self):
53
55
        """Test the abilities of 'bzr ls'"""
54
56
        self.ls_equals('.bzrignore\na\n')
 
57
        self.ls_equals('.bzrignore\na\n', './')
55
58
        self.ls_equals('?        .bzrignore\n'
56
59
                       '?        a\n',
57
60
                       '--verbose')
60
63
                       '--unknown')
61
64
        self.ls_equals('', '--ignored')
62
65
        self.ls_equals('', '--versioned')
 
66
        self.ls_equals('', '-V')
63
67
        self.ls_equals('.bzrignore\n'
64
68
                       'a\n',
65
69
                       '--unknown --ignored --versioned')
 
70
        self.ls_equals('.bzrignore\n'
 
71
                       'a\n',
 
72
                       '--unknown --ignored -V')
66
73
        self.ls_equals('', '--ignored --versioned')
 
74
        self.ls_equals('', '--ignored -V')
67
75
        self.ls_equals('.bzrignore\0a\0', '--null')
68
76
 
69
77
    def test_ls_added(self):
72
80
                       'V        a\n',
73
81
                       '--verbose')
74
82
        self.wt.commit('add')
75
 
        
 
83
 
76
84
        self.build_tree(['subdir/'])
77
85
        self.ls_equals('?        .bzrignore\n'
78
86
                       'V        a\n'
92
100
        self.ls_equals(
93
101
            '.bzrignore                                         \n'
94
102
            'a                                                  a-id\n'
95
 
            'subdir                                             subdir-id\n', 
 
103
            'subdir/                                            subdir-id\n',
96
104
            '--show-ids')
97
105
        self.ls_equals(
98
106
            '?        .bzrignore\n'
99
107
            'V        a                                         a-id\n'
100
 
            'V        subdir/                                   subdir-id\n', 
 
108
            'V        subdir/                                   subdir-id\n',
101
109
            '--show-ids --verbose')
102
110
        self.ls_equals('.bzrignore\0\0'
103
111
                       'a\0a-id\0'
104
112
                       'subdir\0subdir-id\0', '--show-ids --null')
105
113
 
106
 
    def test_ls_recursive(self):
 
114
    def test_ls_no_recursive(self):
107
115
        self.build_tree(['subdir/', 'subdir/b'])
108
116
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
109
117
 
110
118
        self.ls_equals('.bzrignore\n'
111
119
                       'a\n'
112
 
                       'subdir\n'
113
 
                       , '--non-recursive')
 
120
                       'subdir/\n'
 
121
                       , recursive=False)
114
122
 
115
123
        self.ls_equals('V        .bzrignore\n'
116
124
                       'V        a\n'
117
125
                       'V        subdir/\n'
118
 
                       , '--verbose --non-recursive')
 
126
                       , '--verbose', recursive=False)
119
127
 
120
128
        # Check what happens in a sub-directory
121
129
        os.chdir('subdir')
122
130
        self.ls_equals('b\n')
123
131
        self.ls_equals('b\0'
124
132
                  , '--null')
125
 
        self.ls_equals('.bzrignore\n'
126
 
                       'a\n'
127
 
                       'subdir\n'
128
 
                       'subdir/b\n'
 
133
        self.ls_equals('subdir/b\n'
129
134
                       , '--from-root')
130
 
        self.ls_equals('.bzrignore\0'
131
 
                       'a\0'
132
 
                       'subdir\0'
133
 
                       'subdir/b\0'
 
135
        self.ls_equals('subdir/b\0'
134
136
                       , '--from-root --null')
135
 
        self.ls_equals('.bzrignore\n'
136
 
                       'a\n'
137
 
                       'subdir\n'
138
 
                       , '--from-root --non-recursive')
 
137
        self.ls_equals('subdir/b\n'
 
138
                       , '--from-root', recursive=False)
139
139
 
140
140
    def test_ls_path(self):
141
141
        """If a path is specified, files are listed with that prefix"""
146
146
        os.chdir('subdir')
147
147
        self.ls_equals('../.bzrignore\n'
148
148
                       '../a\n'
149
 
                       '../subdir\n'
 
149
                       '../subdir/\n'
150
150
                       '../subdir/b\n' ,
151
151
                       '..')
152
152
        self.ls_equals('../.bzrignore\0'
159
159
                       'V        ../subdir/\n'
160
160
                       'V        ../subdir/b\n' ,
161
161
                       '.. --verbose')
162
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
162
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
163
163
                           'ls --from-root ..')
164
164
 
165
165
    def test_ls_revision(self):
183
183
        self.wt.commit('committing')
184
184
        branch = self.make_branch('branchdir')
185
185
        branch.pull(self.wt.branch)
186
 
        self.ls_equals('branchdir/subdir\n'
 
186
        self.ls_equals('branchdir/subdir/\n'
187
187
                       'branchdir/subdir/b\n',
188
188
                       'branchdir')
189
 
        self.ls_equals('branchdir/subdir\n'
 
189
        self.ls_equals('branchdir/subdir/\n'
190
190
                       'branchdir/subdir/b\n',
191
191
                       'branchdir --revision 1')
192
192
 
215
215
        self.ls_equals('.bzrignore\n'
216
216
                       'a\n'
217
217
                       , '--versioned')
 
218
        self.ls_equals('.bzrignore\n'
 
219
                       'a\n'
 
220
                       , '-V')
218
221
 
219
222
    def test_kinds(self):
220
223
        self.build_tree(['subdir/'])
221
 
        self.ls_equals('.bzrignore\n' 
222
 
                       'a\n', 
 
224
        self.ls_equals('.bzrignore\n'
 
225
                       'a\n',
223
226
                       '--kind=file')
224
 
        self.ls_equals('subdir\n',
 
227
        self.ls_equals('subdir/\n',
225
228
                       '--kind=directory')
226
229
        self.ls_equals('',
227
230
                       '--kind=symlink')
228
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
231
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
232
 
 
233
    def test_ls_path_nonrecursive(self):
 
234
        self.ls_equals('%s/.bzrignore\n'
 
235
                       '%s/a\n'
 
236
                       % (self.test_dir, self.test_dir),
 
237
                       self.test_dir, recursive=False)