Rev 5930: Fix spurious test failure on OSX for WorkingTreeFormat2 in file:///home/vila/src/bzr/bugs/787942-osx-normalizes/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/787942-osx-normalizes/

------------------------------------------------------------
revno: 5930
revision-id: v.ladeuil+lp at free.fr-20110528095237-atve33vssegvbx85
parent: pqm at pqm.ubuntu.com-20110527171203-s50ymd0mviaw4c7k
fixes bug(s): https://launchpad.net/bugs/787942
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 787942-osx-normalizes
timestamp: Sat 2011-05-28 11:52:37 +0200
message:
  Fix spurious test failure on OSX for WorkingTreeFormat2
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- a/bzrlib/tests/per_workingtree/test_smart_add.py	2011-05-18 18:49:43 +0000
+++ b/bzrlib/tests/per_workingtree/test_smart_add.py	2011-05-28 09:52:37 +0000
@@ -299,10 +299,12 @@
     def test_requires_normalized_unicode_filenames_fails_on_unnormalized(self):
         """Adding unnormalized unicode filenames fail if and only if the
         workingtree format has the requires_normalized_unicode_filenames flag
-        set.
+        set and the underlying filesystem doesn't normalize.
         """
         osutils.normalized_filename = osutils._accessible_normalized_filename
-        if self.workingtree_format.requires_normalized_unicode_filenames:
+        if (self.workingtree_format.requires_normalized_unicode_filenames
+            and sys.platform != 'darwin'):
+            self.debug()
             self.assertRaises(
                 errors.NoSuchFile, self.wt.smart_add, [u'a\u030a'])
         else:

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-27 17:12:03 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-28 09:52:37 +0000
@@ -84,6 +84,8 @@
   the default OS buffer size for pipes is small or the ``python -v``
   output is large.  (Andrew Bennetts, #784802)
 
+* Fix spurious test failure on OSX for WorkingTreeFormat2.
+  (Vincent Ladeuil, #787942)
 
 bzr 2.4b3
 #########