Rev 5237: (lifeless) Unbreak a win32 test that has a test method and attribute with in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5237 [merge]
revision-id: pqm at pqm.ubuntu.com-20100518012904-kqnsvviyl17w8e4t
parent: pqm at pqm.ubuntu.com-20100517061117-ql322n4jeqh48w8f
parent: gzlist at googlemail.com-20100516122131-6y6dh5grn27czjuh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-05-18 02:29:04 +0100
message:
  (lifeless) Unbreak a win32 test that has a test method and attribute with
   the same label. (Martin [gz])
modified:
  bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
=== modified file 'bzrlib/tests/test__walkdirs_win32.py'
--- a/bzrlib/tests/test__walkdirs_win32.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/test__walkdirs_win32.py	2010-05-16 12:21:31 +0000
@@ -74,7 +74,7 @@
         self.assertReadDir([('foo', 'foo', 'file', u'./foo')],
             '', u'.')
 
-    def test_dir(self):
+    def test_directory(self):
         self.build_tree(['bar/'])
         self.assertReadDir([('bar', 'bar', 'directory', u'./bar')],
             '', u'.')