← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_basis_inventory.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_basis_inventory.py
1
 
# Copyright (C) 2004, 2005, 2008 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011, 2012, 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
41
41
        self.assertTrue(t._transport.has('basis-inventory-cache'))
42
42
 
43
43
        basis_inv = t.basis_tree().root_inventory
44
 
        self.assertEquals('r1', basis_inv.revision_id)
 
44
        self.assertEqual('r1', basis_inv.revision_id)
45
45
 
46
46
        store_inv = b.repository.get_inventory('r1')
47
47
        self.assertEqual([], store_inv._make_delta(basis_inv))
54
54
 
55
55
        basis_inv_txt = t.read_basis_inventory()
56
56
        basis_inv = bzrlib.xml7.serializer_v7.read_inventory_from_string(basis_inv_txt)
57
 
        self.assertEquals('r2', basis_inv.revision_id)
 
57
        self.assertEqual('r2', basis_inv.revision_id)
58
58
        store_inv = b.repository.get_inventory('r2')
59
59
 
60
60
        self.assertEqual([], store_inv._make_delta(basis_inv))