Rev 2387: Update test_unicode_bundle, since we know how it fails on Mac OSX in http://bzr.arbash-meinel.com/branches/bzr/mac

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/mac

------------------------------------------------------------
revno: 2387
revision-id: john at arbash-meinel.com-20070329191928-654ol08hdlfir4zj
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mac
timestamp: Thu 2007-03-29 14:19:28 -0500
message:
  Update test_unicode_bundle, since we know how it fails on Mac OSX
modified:
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
-------------- next part --------------
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py	2007-03-06 06:35:00 +0000
+++ b/bzrlib/tests/test_bundle.py	2007-03-29 19:19:28 +0000
@@ -784,10 +784,20 @@
             u'William Dod\xe9\n').encode('utf-8'))
         f.close()
 
-        self.tree1.add([u'with Dod\xe9'])
-        self.tree1.commit(u'i18n commit from William Dod\xe9', 
+        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
+        self.tree1.commit(u'i18n commit from William Dod\xe9',
                           rev_id='i18n-1', committer=u'William Dod\xe9')
 
+        if sys.platform == 'darwin':
+            # On Mac the '\xe9' gets changed to 'e\u0301'
+            self.assertEqual([u'.bzr', u'with Dode\u0301'],
+                             sorted(os.listdir(u'b1')))
+            delta = self.tree1.changes_from(self.tree1.basis_tree())
+            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
+                             delta.removed)
+            self.knownFailure("Mac OSX doesn't preserve unicode"
+                              " combining characters.")
+
         # Add
         bundle = self.get_valid_bundle(None, 'i18n-1')