← 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: Jelmer Vernooij
  • Date: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
https://launchpad.net/bugs/1565503
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

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