/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/per_branch/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_reconcile.py
68
68
    def test_reconcile_returns_reconciler(self):
69
69
        a_branch = self.make_branch('a_branch')
70
70
        result = a_branch.reconcile()
71
 
        self.assertIsInstance(result, reconcile.BranchReconciler)
 
71
        self.assertIsInstance(result, reconcile.ReconcileResult)
72
72
        # No history to fix
73
 
        self.assertIs(False, result.fixed_history)
 
73
        self.assertIs(False, getattr(result, 'fixed_history', False))
74
74
 
75
75
    def test_reconcile_supports_thorough(self):
76
76
        a_branch = self.make_branch('a_branch')