/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_pull.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_pull.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
35
35
        cmd = builtins.cmd_pull()
36
36
        # We don't care about the ouput but 'outf' should be defined
37
37
        cmd.outf = tests.StringIOWrapper()
38
 
        cmd.run(self.get_url('branch1'), directory='branch2')
 
38
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
39
39
        self.assertEquals(1, len(self.connections))
40
40
 
41
41
    def test_pull_with_bound_branch(self):
53
53
        pull = builtins.cmd_pull()
54
54
        # We don't care about the ouput but 'outf' should be defined
55
55
        pull.outf = tests.StringIOWrapper()
56
 
        pull.run(self.get_url('remote'), directory='local')
 
56
        pull.run_direct(self.get_url('remote'), directory='local')
57
57
        self.assertEquals(1, len(self.connections))
58
58