/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_cat.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 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
 
 
32
28
        # Redirect sys.stdout as this is what cat uses
33
29
        self.outf = StringIOWrapper()
34
 
        self._stdout_orig = sys.stdout
35
 
        sys.stdout = self.outf
36
 
        self.addCleanup(restore_stdout)
 
30
        self.overrideAttr(sys, 'stdout', self.outf)
37
31
 
38
32
    def test_cat(self):
39
33
        # FIXME: sftp raises ReadError instead of NoSuchFile when probing for
50
44
        self.start_logging_connections()
51
45
 
52
46
        cmd = cmd_cat()
53
 
        cmd.run(self.get_url('branch/foo'))
 
47
        cmd.run_direct(self.get_url('branch/foo'))
54
48
        self.assertEquals(1, len(self.connections))
55
49
        self.assertEquals('foo', self.outf.getvalue())
56
50