/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_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 10:56:06 UTC
  • mto: This revision was merged to the branch mainline in revision 7030.
  • Revision ID: jelmer@jelmer.uk-20180708105606-d53hkks89qq88twu
Use separate .as_bytes method rather than __bytes__.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2011 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
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import bzrdir, errors, tests
21
 
from bzrlib.reconcile import reconcile, Reconciler
22
 
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
24
 
from bzrlib.transport import get_transport
25
 
from bzrlib.workingtree import WorkingTree
26
 
 
27
 
 
28
 
class TestWorksWithSharedRepositories(TestCaseWithRepository):
 
20
from breezy import (
 
21
    errors,
 
22
    tests,
 
23
    )
 
24
from breezy.bzr import (
 
25
    bzrdir,
 
26
    )
 
27
from breezy.reconcile import reconcile, Reconciler
 
28
from breezy.tests import per_repository
 
29
 
 
30
 
 
31
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
29
32
 
30
33
    def test_reweave_empty(self):
31
34
        # we want a repo capable format
49
52
 
50
53
    def test_reconciler_with_no_branch(self):
51
54
        repo = self.make_repository('repo')
52
 
        reconciler = Reconciler(repo.bzrdir)
 
55
        reconciler = Reconciler(repo.controldir)
53
56
        reconciler.reconcile()
54
57
        # no inconsistent parents should have been found
55
58
        # but the values should have been set.
60
63
 
61
64
    def test_reconciler_finds_branch(self):
62
65
        a_branch = self.make_branch('a_branch')
63
 
        reconciler = Reconciler(a_branch.bzrdir)
 
66
        reconciler = Reconciler(a_branch.controldir)
64
67
        reconciler.reconcile()
65
68
 
66
69
        # It should have checked the repository, and the branch