Rev 3656: Fixed as per jam's review. in http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

------------------------------------------------------------
revno: 3656
revision-id: v.ladeuil+lp at free.fr-20080911105331-eoyl4qrfpu2v0pj4
parent: v.ladeuil+lp at free.fr-20080911085659-74uay5588sjdi88k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 12:53:31 +0200
message:
  Fixed as per jam's review.
  
  * bzrlib/tests/test_bundle.py:
  (BundleTester.test_unicode_bundle): Use an unicode file name, but
  not an ambiguous one.
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	2008-09-08 15:31:26 +0000
+++ b/bzrlib/tests/test_bundle.py	2008-09-11 10:53:31 +0000
@@ -795,7 +795,7 @@
         # Handle international characters
         os.mkdir('b1')
         try:
-            f = open(u'b1/foo', 'wb')
+            f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
         except UnicodeEncodeError:
             raise TestSkipped("Filesystem doesn't support unicode")
 
@@ -807,7 +807,7 @@
             u'William Dod\xe9\n').encode('utf-8'))
         f.close()
 
-        self.tree1.add([u'foo'], ['withdod-id'])
+        self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
         self.tree1.commit(u'i18n commit from William Dod\xe9',
                           rev_id='i18n-1', committer=u'William Dod\xe9')
 
@@ -815,7 +815,7 @@
         bundle = self.get_valid_bundle('null:', 'i18n-1')
 
         # Modified
-        f = open(u'b1/foo', 'wb')
+        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
         f.write(u'Modified \xb5\n'.encode('utf8'))
         f.close()
         self.tree1.commit(u'modified', rev_id='i18n-2')
@@ -823,14 +823,14 @@
         bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
 
         # Renamed
-        self.tree1.rename_one(u'foo', u'bar')
+        self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
         self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
                           committer=u'Erik B\xe5gfors')
 
         bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
 
         # Removed
-        self.tree1.remove([u'bar'])
+        self.tree1.remove([u'B\N{Euro Sign}gfors'])
         self.tree1.commit(u'removed', rev_id='i18n-4')
 
         bundle = self.get_valid_bundle('i18n-3', 'i18n-4')