← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inventory_delta.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/test_inventory_delta.py
1
 
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 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
200
200
            allow_versioned_root=False)
201
201
        err = self.assertRaises(inventory_delta.IncompatibleInventoryDelta,
202
202
            deserializer.parse_text_bytes, root_only_lines)
203
 
        self.assertEquals("versioned_root not allowed", str(err))
 
203
        self.assertEqual("versioned_root not allowed", str(err))
204
204
 
205
205
    def test_parse_tree_when_disabled(self):
206
206
        deserializer = inventory_delta.InventoryDeltaDeserializer(
207
207
            allow_tree_references=False)
208
208
        err = self.assertRaises(inventory_delta.IncompatibleInventoryDelta,
209
209
            deserializer.parse_text_bytes, reference_lines)
210
 
        self.assertEquals("Tree reference not allowed", str(err))
 
210
        self.assertEqual("Tree reference not allowed", str(err))
211
211
 
212
212
    def test_parse_tree_when_header_disallows(self):
213
213
        # A deserializer that allows tree_references to be set or unset.