← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Florent Gallaire
  • Date: 2017-03-17 10:39:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6622.
  • Revision ID: fgallaire@gmail.com-20170317103902-xsmafws9vn8rczx9
Fix for Windows and 32-bit platforms buggy gmtime().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_pull.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010, 2011, 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
 
18
 
from bzrlib.builtins import cmd_pull
19
 
from bzrlib.tests import StringIOWrapper
20
 
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
21
 
 
22
 
 
23
 
class TestPull(TestCaseWithConnectionHookedTransport):
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib import (
 
19
    branch,
 
20
    builtins,
 
21
    tests,
 
22
    )
 
23
from bzrlib.tests import transport_util
 
24
 
 
25
 
 
26
class TestPull(transport_util.TestCaseWithConnectionHookedTransport):
24
27
 
25
28
    def test_pull(self):
26
29
        wt1 = self.make_branch_and_tree('branch1')
27
30
        tip = wt1.commit('empty commit')
28
31
        wt2 = self.make_branch_and_tree('branch2')
29
32
 
30
 
        self.install_hooks()
 
33
        self.start_logging_connections()
31
34
 
32
 
        cmd = cmd_pull()
 
35
        cmd = builtins.cmd_pull()
33
36
        # We don't care about the ouput but 'outf' should be defined
34
 
        cmd.outf = StringIOWrapper()
 
37
        cmd.outf = tests.StringIOWrapper()
35
38
        cmd.run(self.get_url('branch1'), directory='branch2')
36
 
        self.assertEquals(1, len(self.connections))
 
39
        self.assertEqual(1, len(self.connections))
 
40
 
 
41
    def test_pull_with_bound_branch(self):
 
42
 
 
43
        master_wt = self.make_branch_and_tree('master')
 
44
        local_wt = self.make_branch_and_tree('local')
 
45
        master_branch = branch.Branch.open(self.get_url('master'))
 
46
        local_wt.branch.bind(master_branch)
 
47
 
 
48
        remote_wt = self.make_branch_and_tree('remote')
 
49
        remote_wt.commit('empty commit')
 
50
 
 
51
        self.start_logging_connections()
 
52
 
 
53
        pull = builtins.cmd_pull()
 
54
        # We don't care about the ouput but 'outf' should be defined
 
55
        pull.outf = tests.StringIOWrapper()
 
56
        pull.run(self.get_url('remote'), directory='local')
 
57
        self.assertEqual(2, len(self.connections))
37
58