~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: Patch Queue Manager
  • Date: 2015-10-05 13:45:00 UTC
  • mfrom: (6603.3.1 bts794146)
  • Revision ID: pqm@pqm.ubuntu.com-20151005134500-v244rho557tv0ukd
(vila) Resolve Bug #1480015: Test failure: hexify removed from paramiko
 (Andrew Starr-Bochicchio) (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
56
56
    repo_b = br_b.repository
57
57
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
58
58
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
59
 
    self.assertEqual(len(revision_history(br_b)), 7)
 
59
    self.assertEquals(len(revision_history(br_b)), 7)
60
60
    br_b.fetch(br_a, revision_history(br_a)[2])
61
61
    # branch.fetch is not supposed to alter the revision history
62
 
    self.assertEqual(len(revision_history(br_b)), 7)
 
62
    self.assertEquals(len(revision_history(br_b)), 7)
63
63
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
64
64
 
65
65
    # fetching the next revision up in sample data copies one revision