← 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: Patch Queue Manager
  • Date: 2016-02-01 19:56:05 UTC
  • mfrom: (6615.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201195605-o7rl92wf6uyum3fk
(vila) Open trunk again as 2.8b1 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inventory_delta.py
1
 
# Copyright (C) 2009, 2010 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
22
22
from cStringIO import StringIO
23
23
 
24
24
from bzrlib import (
25
 
    errors,
26
25
    inventory,
27
26
    inventory_delta,
28
27
    )
201
200
            allow_versioned_root=False)
202
201
        err = self.assertRaises(inventory_delta.IncompatibleInventoryDelta,
203
202
            deserializer.parse_text_bytes, root_only_lines)
204
 
        self.assertEquals("versioned_root not allowed", str(err))
 
203
        self.assertEqual("versioned_root not allowed", str(err))
205
204
 
206
205
    def test_parse_tree_when_disabled(self):
207
206
        deserializer = inventory_delta.InventoryDeltaDeserializer(
208
207
            allow_tree_references=False)
209
208
        err = self.assertRaises(inventory_delta.IncompatibleInventoryDelta,
210
209
            deserializer.parse_text_bytes, reference_lines)
211
 
        self.assertEquals("Tree reference not allowed", str(err))
 
210
        self.assertEqual("Tree reference not allowed", str(err))
212
211
 
213
212
    def test_parse_tree_when_header_disallows(self):
214
213
        # A deserializer that allows tree_references to be set or unset.