Rev 4628: (robertc) Tweak log test changes made for 2a-default as per igc's in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4628 [merge]
revision-id: pqm at pqm.ubuntu.com-20090819030231-xjwlii48wpfy8qui
parent: pqm at pqm.ubuntu.com-20090818232740-8q7ms2nntw9ckyvq
parent: robertc at robertcollins.net-20090819014441-7m54nhv96hn1eatu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-08-19 04:02:31 +0100
message:
  (robertc) Tweak log test changes made for 2a-default as per igc's
  	review. (Robert Collins)
modified:
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
=== 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('.')