Rev 4143: (vila) Restore the test that the OSError exception raised from in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4143
revision-id: pqm at pqm.ubuntu.com-20090313044136-mvoy4mgr8az583ih
parent: pqm at pqm.ubuntu.com-20090313035623-vn0615cs6bd6590e
parent: v.ladeuil+lp at free.fr-20090313034919-mcfvnt005co93pyl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 04:41:36 +0000
message:
  (vila) Restore the test that the OSError exception raised from
  	walkdirs includes the file the error occured on in its str()
modified:
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    revno: 4138.1.1
    revision-id: v.ladeuil+lp at free.fr-20090313034919-mcfvnt005co93pyl
    parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
    parent: v.ladeuil+lp at free.fr-20090313011055-yvqqtdejc7ferth7
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Fri 2009-03-13 13:49:19 +1000
    message:
      Restore the test that the OSError exception raised from walkdirs includes the file the error occured on in its str()
    modified:
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    revno: 4133.1.2
    revision-id: v.ladeuil+lp at free.fr-20090313011055-yvqqtdejc7ferth7
    parent: v.ladeuil+lp at free.fr-20090312132005-cdcrdk8ps85c17o2
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 341648-fragile-test
    timestamp: Fri 2009-03-13 11:10:55 +1000
    message:
      Fixed as per Martin's remark about the intent of the test :-}
    modified:
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-03-12 13:20:05 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-03-13 01:10:55 +0000
@@ -896,6 +896,8 @@
         e = self.assertRaises(OSError, list, osutils._walkdirs_utf8("."))
         self.assertEquals('./test-unreadable', e.filename)
         self.assertEquals(errno.EACCES, e.errno)
+        # Ensure the message contains the file name
+        self.assertContainsRe(str(e), "\./test-unreadable")
 
     def test__walkdirs_utf8(self):
         tree = [