← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2012-09-19 07:58:27 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: This revision was merged to the branch mainline in revision 6563.
  • Revision ID: john@arbash-meinel.com-20120919075827-36b2b042kiaps0d3
Merge bzr-2.5.2 into trunk to get the fixes for ConnectionReset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2012 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
540
540
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
541
541
        revid1 = to_tree.commit('my commit')
542
542
        out = self.run_bzr(['pull', '-d', 'to', 'from'], retcode=1)
543
 
        self.assertEqual(out,
 
543
        self.assertEquals(out,
544
544
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
545
545
        out = self.run_bzr(['pull', '-d', 'to', '--overwrite-tags', 'from'])
546
 
        self.assertEqual(out, ('1 tag(s) updated.\n', ''))
 
546
        self.assertEquals(out, ('1 tag(s) updated.\n', ''))
547
547
 
548
 
        self.assertEqual(to_tree.branch.tags.lookup_tag('mytag'),
 
548
        self.assertEquals(to_tree.branch.tags.lookup_tag('mytag'),
549
549
                          'somerevid')
550
 
        self.assertEqual(to_tree.branch.last_revision(), revid1)
 
550
        self.assertEquals(to_tree.branch.last_revision(), revid1)
551
551
 
552
552
    def test_pull_tag_overwrite(self):
553
553
        """pulling tags with --overwrite only reports changed tags."""