Rev 3650: Fix test missed in the previous commit (--starting-with doesn't replace in http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 3650
revision-id: v.ladeuil+lp at free.fr-20080908122627-2jkk2jpv2exn31fj
parent: v.ladeuil+lp at free.fr-20080908115340-9e8ef038ryotedx7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 14:26:27 +0200
message:
  Fix test missed in the previous commit (--starting-with doesn't replace
  running the full test suite, copied 100 times).
  
  * bzrlib/tests/tree_implementations/test_test_trees.py:
  (TestTreeShapes.test_tree_with_utf8): Use non-combining
  unicode chars to avoid normalization ambiguities.
modified:
  bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
-------------- next part --------------
=== modified file 'bzrlib/tests/tree_implementations/test_test_trees.py'
--- a/bzrlib/tests/tree_implementations/test_test_trees.py	2008-09-08 11:53:40 +0000
+++ b/bzrlib/tests/tree_implementations/test_test_trees.py	2008-09-08 12:26:27 +0000
@@ -216,13 +216,14 @@
 
         revision_id = u'r\xe9v-1'.encode('utf8')
         root_id = 'TREE_ROOT'
-        bar_id = u'b\xe5r-id'.encode('utf8')
-        foo_id = u'f\xf6-id'.encode('utf8')
-        baz_id = u'b\xe1z-id'.encode('utf8')
-        path_and_ids = [(u'', root_id, None),
-                        (u'b\xe5r', bar_id, root_id),
-                        (u'f\xf6', foo_id, root_id),
-                        (u'b\xe5r/b\xe1z', baz_id, bar_id),
+        bar_id = u'ba\N{Euro Sign}r-id'.encode('utf8')
+        foo_id = u'fo\N{Euro Sign}o-id'.encode('utf8')
+        baz_id = u'ba\N{Euro Sign}z-id'.encode('utf8')
+        path_and_ids = [(u'', root_id, None, None),
+                        (u'ba\N{Euro Sign}r', bar_id, root_id, revision_id_1),
+                        (u'fo\N{Euro Sign}o', foo_id, root_id, revision_id_1),
+                        (u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
+                         baz_id, bar_id, revision_id_1),
                        ]
         tree.lock_read()
         try: