/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/test__walkdirs_win32.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__walkdirs_win32.py
74
74
        self.assertReadDir([('foo', 'foo', 'file', u'./foo')],
75
75
            '', u'.')
76
76
 
77
 
    def test_dir(self):
 
77
    def test_directory(self):
78
78
        self.build_tree(['bar/'])
79
79
        self.assertReadDir([('bar', 'bar', 'directory', u'./bar')],
80
80
            '', u'.')