Rev 4653: (vila) Catch up fix for #347649 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4653 [merge]
revision-id: pqm at pqm.ubuntu.com-20090826222959-c50xt4pb58g4lv1d
parent: pqm at pqm.ubuntu.com-20090826124958-pwu4xwec4nyn01nn
parent: v.ladeuil+lp at free.fr-20090826205652-zl24tg1f5dq8chot
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-08-26 23:29:59 +0100
message:
  (vila) Catch up fix for #347649
modified:
  bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
=== 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()