Rev 4628: Review feedback per IanC. in http://bazaar.launchpad.net/~lifeless/bzr/test-log

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/test-log

------------------------------------------------------------
revno: 4628
revision-id: robertc at robertcollins.net-20090819014441-7m54nhv96hn1eatu
parent: pqm at pqm.ubuntu.com-20090818232740-8q7ms2nntw9ckyvq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-log
timestamp: Wed 2009-08-19 11:44:41 +1000
message:
  Review feedback per IanC.
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-08-17 23:15:55 +0000
+++ b/bzrlib/tests/test_log.py	2009-08-19 01:44:41 +0000
@@ -142,11 +142,11 @@
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
         committed_msg = lf.revisions[0].rev.message
-        if msg == committed_msg:
-            raise tests.KnownFailure(
-                "Commit message was preserved, but it wasn't expected to be.")
-        self.assertNotEqual(msg, committed_msg)
-        self.assertTrue(len(committed_msg) > len(msg))
+        if wt.branch.repository._serializer.squashes_xml_invalid_characters:
+            self.assertNotEqual(msg, committed_msg)
+            self.assertTrue(len(committed_msg) > len(msg))
+        else:
+            self.assertEqual(msg, committed_msg)
 
     def test_commit_message_without_control_chars(self):
         wt = self.make_branch_and_tree('.')