← Back to branch summary

~jelmer/brz/hpss-working-tree-update

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-18 20:21:49 UTC
  • mfrom: (6313.1.655 work)
  • Revision ID: jelmer@jelmer.uk-20180518202149-xcn8r775zgwi8x5n
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/commands/test_cat.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010, 2016 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
16
16
 
17
17
import sys
18
18
 
19
 
from bzrlib.builtins import cmd_cat
20
 
from bzrlib.tests import StringIOWrapper
21
 
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
 
19
from ...builtins import cmd_cat
 
20
from ...tests import (
 
21
    ui_testing,
 
22
    )
 
23
from ...tests.transport_util import TestCaseWithConnectionHookedTransport
22
24
 
23
25
 
24
26
class TestCat(TestCaseWithConnectionHookedTransport):
25
27
 
26
 
    def setUp(self):
27
 
        super(TestCat, self).setUp()
28
 
        # Redirect sys.stdout as this is what cat uses
29
 
        self.outf = StringIOWrapper()
30
 
        self.overrideAttr(sys, 'stdout', self.outf)
31
 
 
32
28
    def test_cat(self):
33
 
        # FIXME: sftp raises ReadError instead of NoSuchFile when probing for
34
 
        # branch/foo/.bzr/branch-format when used with the paramiko test
35
 
        # server.
36
 
        from bzrlib.tests import TestSkipped
37
 
        raise TestSkipped('SFTPTransport raises incorrect exception'
38
 
                          ' when reading from paramiko server')
39
29
        wt1 = self.make_branch_and_tree('branch')
40
 
        self.build_tree_contents([('branch/foo', 'foo')])
 
30
        self.build_tree_contents([('branch/foo', b'foo')])
41
31
        wt1.add('foo')
42
32
        wt1.commit('add foo')
43
33
 
44
34
        self.start_logging_connections()
45
35
 
46
36
        cmd = cmd_cat()
 
37
        cmd.outf = ui_testing.StringIOWithEncoding()
47
38
        cmd.run(self.get_url('branch/foo'))
48
 
        self.assertEquals(1, len(self.connections))
49
 
        self.assertEquals('foo', self.outf.getvalue())
 
39
        self.assertEqual(1, len(self.connections))
 
40
        self.assertEqual('foo', cmd.outf.getvalue())
50
41