Rev 3672: (Lukáš Lalinský) Fix test_pending_specific_files. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3672
revision-id: pqm at pqm.ubuntu.com-20080901234631-p34773b45k4j4l92
parent: pqm at pqm.ubuntu.com-20080901090124-w1cxlizdk4g3mstv
parent: jelmer at samba.org-20080901231311-yqc7uxiis4uzeeqa
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-02 00:46:31 +0100
message:
  (Lukáš Lalinský) Fix test_pending_specific_files.
modified:
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
    ------------------------------------------------------------
    revno: 3671.1.1
    revision-id: jelmer at samba.org-20080901231311-yqc7uxiis4uzeeqa
    parent: pqm at pqm.ubuntu.com-20080901090124-w1cxlizdk4g3mstv
    parent: lalinsky at gmail.com-20080828110133-dvlvpfhsrdlothip
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: lucas-utf8fix
    timestamp: Tue 2008-09-02 01:13:11 +0200
    message:
      Merge test_pending_specific_files fix from Lucas.
    modified:
      bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
    ------------------------------------------------------------
    revno: 3655.2.1
    revision-id: lalinsky at gmail.com-20080828110133-dvlvpfhsrdlothip
    parent: pqm at pqm.ubuntu.com-20080828092217-98wmtek2p8cie8sc
    committer: Lukáš Lalinský <lalinsky at gmail.com>
    branch nick: test_pending_specific_files
    timestamp: Thu 2008-08-28 13:01:33 +0200
    message:
      Fix test_pending_specific_files
    modified:
      bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2008-08-16 22:28:01 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2008-08-28 11:01:33 +0000
@@ -452,7 +452,7 @@
         self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
         alt_id = alt.commit('alt')
         tree.merge_from_branch(alt.branch)
-        output = StringIO()
+        output = self.make_utf8_encoded_stringio()
         show_tree_status(tree, to_file=output)
         self.assertContainsRe(output.getvalue(), 'pending merges:')
         out, err = self.run_bzr('status tree/a')