Rev 4653: Catch up fix for #347649 in http://bazaar.launchpad.net/~vila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration

------------------------------------------------------------
revno: 4653 [merge]
revision-id: v.ladeuil+lp at free.fr-20090826205652-zl24tg1f5dq8chot
parent: v.ladeuil+lp at free.fr-20090826102428-0i2h7b0lu7nh7klb
parent: v.ladeuil+lp at free.fr-20090826090602-uu9vapyw6yhbz6ak
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Wed 2009-08-26 22:56:52 +0200
message:
  Catch up fix for #347649
modified:
  bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py'
--- a/bzrlib/tests/blackbox/test_filesystem_cicp.py	2009-04-06 08:17:53 +0000
+++ b/bzrlib/tests/blackbox/test_filesystem_cicp.py	2009-08-26 09:06:02 +0000
@@ -216,12 +216,19 @@
 
 
 class TestMisc(TestCICPBase):
+
     def test_status(self):
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
 
-        self.check_output('added:\n  CamelCaseParent/CamelCase\n  lowercaseparent/lowercase\n',
-                          'status camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE')
+        self.check_output(
+            """added:
+  CamelCaseParent/
+  CamelCaseParent/CamelCase
+  lowercaseparent/
+  lowercaseparent/lowercase
+""",
+            'status camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE')
 
     def test_ci(self):
         wt = self._make_mixed_case_tree()