← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_cat.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_cat.py
25
25
 
26
26
    def setUp(self):
27
27
        super(TestCat, self).setUp()
 
28
 
 
29
        def restore_stdout():
 
30
            sys.stdout = self._stdout_orig
 
31
 
28
32
        # Redirect sys.stdout as this is what cat uses
29
33
        self.outf = StringIOWrapper()
30
 
        self.overrideAttr(sys, 'stdout', self.outf)
 
34
        self._stdout_orig = sys.stdout
 
35
        sys.stdout = self.outf
 
36
        self.addCleanup(restore_stdout)
31
37
 
32
38
    def test_cat(self):
33
39
        # FIXME: sftp raises ReadError instead of NoSuchFile when probing for
44
50
        self.start_logging_connections()
45
51
 
46
52
        cmd = cmd_cat()
47
 
        cmd.run(self.get_url('branch/foo'))
 
53
        cmd.run_direct(self.get_url('branch/foo'))
48
54
        self.assertEquals(1, len(self.connections))
49
55
        self.assertEquals('foo', self.outf.getvalue())
50
56