← 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: Aaron Bentley
  • Date: 2010-05-10 11:34:20 UTC
  • mfrom: (5218 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5221.
  • Revision ID: aaron@aaronbentley.com-20100510113420-toh2d5yioobb5uq1
Merged bzr.dev into transform-commit-full.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib import ignores
 
21
from bzrlib import ignores, osutils
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
 
24
24
 
235
235
                       '%s/a\n'
236
236
                       % (self.test_dir, self.test_dir),
237
237
                       self.test_dir, recursive=False)
 
238
 
 
239
    def test_ls_directory(self):
 
240
        """Test --directory option"""
 
241
        self.wt = self.make_branch_and_tree('dir')
 
242
        self.build_tree(['dir/sub/', 'dir/sub/file'])
 
243
        self.wt.add(['sub', 'sub/file'])
 
244
        self.wt.commit('commit')
 
245
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
 
246
        self.ls_equals('sub/file\n', '-d dir sub')