[MERGE] OSX test suite passing (well as of 2008/09/08 :)

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:

=== modified file 'bzrlib/tests/test_bundle.py'
...
@@ -796,7 +795,7 @@
         # Handle international characters
         os.mkdir('b1')
         try:
- -            f = open(u'b1/with Dod\xe9', 'wb')
+            f = open(u'b1/foo', 'wb')
         except UnicodeEncodeError:
             raise TestSkipped("Filesystem doesn't support unicode")

@@ -808,44 +807,30 @@
             u'William Dod\xe9\n').encode('utf-8'))
         f.close()

- -        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
+        self.tree1.add([u'foo'], ['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':
- -            from bzrlib.workingtree import WorkingTree3
- -            if type(self.tree1) is WorkingTree3:
- -                self.knownFailure("Bug #141438: fails for WorkingTree3
on OSX")
- -
- -            # 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('null:', 'i18n-1')

         # Modified
- -        f = open(u'b1/with Dod\xe9', 'wb')
+        f = open(u'b1/foo', 'wb')
         f.write(u'Modified \xb5\n'.encode('utf8'))
         f.close()
         self.tree1.commit(u'modified', rev_id='i18n-2')

         bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
- -
+
         # Renamed
- -        self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
+        self.tree1.rename_one(u'foo', u'bar')
         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'B\xe5gfors'])
+        self.tree1.remove([u'bar'])
         self.tree1.commit(u'removed', rev_id='i18n-4')

         bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
@@ -1583,7 +1568,7 @@
         record = record_iter.next()
         self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
             'info', None, None), record)
- -        self.assertRaises(BadBundle, record_iter.next)
+        self.assertRaises(errors.BadBundle, record_iter.next)

^- These changes aren't correct. We *should* test that bundles can
properly transmit non-ascii characters. We should just do it with a
different character than "'\xe9'".

...


The rest seem good. I really want this in bzr.dev, I'm not terribly
concerned with it landing in 1.7.

BB:tweak

(Though you may want to resubmit to look over how you handle unicode
characters in bundles.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjGmSkACgkQJdeBCYSNAAP9gwCeO2ibKoeU8HSRQ8TU93H9Pl0F
6LoAn1qMTMKXDMmYEdRUUn25bmVyYKEq
=+dEH
-----END PGP SIGNATURE-----