← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2013, 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
545
545
        original_parents = to_tree.get_parent_ids()
546
546
        self.assertIs(repository.has_revision(base_rev_id), True)
547
547
        for rev in info.real_revisions:
548
 
            self.assert_(not repository.has_revision(rev.revision_id),
549
 
                'Revision {%s} present before applying bundle'
550
 
                % rev.revision_id)
 
548
            self.assertTrue(not repository.has_revision(rev.revision_id),
 
549
                            'Revision {%s} present before applying bundle'
 
550
                            % rev.revision_id)
551
551
        merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
552
552
 
553
553
        for rev in info.real_revisions:
554
 
            self.assert_(repository.has_revision(rev.revision_id),
555
 
                'Missing revision {%s} after applying bundle'
556
 
                % rev.revision_id)
 
554
            self.assertTrue(repository.has_revision(rev.revision_id),
 
555
                            'Missing revision {%s} after applying bundle'
 
556
                            % rev.revision_id)
557
557
 
558
 
        self.assert_(to_tree.branch.repository.has_revision(info.target))
 
558
        self.assertTrue(to_tree.branch.repository.has_revision(info.target))
559
559
        # Do we also want to verify that all the texts have been added?
560
560
 
561
561
        self.assertEqual(original_parents + [info.target],
562
 
            to_tree.get_parent_ids())
 
562
                         to_tree.get_parent_ids())
563
563
 
564
564
        rev = info.real_revisions[-1]
565
565
        base_tree = self.b1.repository.revision_tree(rev.revision_id)