← 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: Aaron Bentley
  • Date: 2009-11-03 15:45:56 UTC
  • mto: (4634.97.2 2.0)
  • mto: This revision was merged to the branch mainline in revision 4798.
  • Revision ID: aaron@aaronbentley.com-20091103154556-e953dmegqbinyokq
Improve patch binary section handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_cat.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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_direct(self.get_url('branch/foo'))
 
53
        cmd.run(self.get_url('branch/foo'))
48
54
        self.assertEquals(1, len(self.connections))
49
55
        self.assertEquals('foo', self.outf.getvalue())
50
56