/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: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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'.')