/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_inventory_delta.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_inventory_delta.py
354
354
            versioned_root=True, tree_references=True)
355
355
        err = self.assertRaises(InventoryDeltaError,
356
356
            serializer.delta_to_lines, NULL_REVISION, 'entry-version', delta)
357
 
        self.assertEqual(str(err), 'no version for fileid id')
 
357
        self.assertContainsRe(str(err), "^no version for fileid b?'id'$")
358
358
 
359
359
    def test_richroot_unversioned_root_errors(self):
360
360
        old_inv = Inventory(None)
366
366
            versioned_root=True, tree_references=True)
367
367
        err = self.assertRaises(InventoryDeltaError,
368
368
            serializer.delta_to_lines, NULL_REVISION, 'entry-version', delta)
369
 
        self.assertEqual(str(err), 'no version for fileid TREE_ROOT')
 
369
        self.assertContainsRe(
 
370
            str(err), "no version for fileid b?'TREE_ROOT'$")
370
371
 
371
372
    def test_nonrichroot_versioned_root_errors(self):
372
373
        old_inv = Inventory(None)
379
380
            versioned_root=False, tree_references=True)
380
381
        err = self.assertRaises(InventoryDeltaError,
381
382
            serializer.delta_to_lines, NULL_REVISION, 'entry-version', delta)
382
 
        self.assertStartsWith(str(err), 'Version present for / in TREE_ROOT')
 
383
        self.assertContainsRe(
 
384
            str(err), "^Version present for / in b?'TREE_ROOT'")
383
385
 
384
386
    def test_unknown_kind_errors(self):
385
387
        old_inv = Inventory(None)