/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: Vincent Ladeuil
  • Date: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: v.ladeuil+lp@free.fr-20100120160528-5yo3fbggdp07eovc
Finish the patch based on reviews.

* bzrlib/tests/per_merger.py:
Fix line too long and spurious spaces.

* bzrlib/plugins/news_merge/tests/test_news_merge.py:
(TestFilenameMatchesConfig): Ensure that the params get updated.

* bzrlib/plugins/news_merge/__init__.py:
(filename_matches_config): Save the relevant config variable in
the hook params.
(install_hook): Wrap the hook installation so we can reuse it for
tests.

* bzrlib/plugins/news_merge/README: 
Update the instructions by pointing to the plugin help.

* bzrlib/merge.py:
(MergeHookParams): Delete spurious spaces.

* bzrlib/decorators.py:
(use_pretty_decorators): Mention that we get clearance to copy
launchpad code here (since canonical has copyrights on both code
bases).

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(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