← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Robert Collins
  • Date: 2009-07-07 04:32:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4524.
  • Revision ID: robertc@robertcollins.net-20090707043213-4hjjhgr40iq7gk2d
More informative assertions in xml serialisation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
import bzrlib
21
 
import bzrlib.errors as errors
 
20
from bzrlib import bzrdir, errors, tests
22
21
from bzrlib.reconcile import reconcile, Reconciler
23
22
from bzrlib.revision import Revision
24
 
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
 
23
from bzrlib.tests.per_repository import TestCaseWithRepository
25
24
from bzrlib.transport import get_transport
26
25
from bzrlib.workingtree import WorkingTree
27
26
 
30
29
 
31
30
    def test_reweave_empty(self):
32
31
        # we want a repo capable format
33
 
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
 
32
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
34
33
        parent.create_repository(shared=True)
35
34
        parent.root_transport.mkdir('child')
36
 
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
 
35
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
37
36
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
38
37
        reconciler = Reconciler(child)
39
38
        reconciler.reconcile()
44
43
        self.assertEqual(0, reconciler.inconsistent_parents)
45
44
        # and no garbage inventories
46
45
        self.assertEqual(0, reconciler.garbage_inventories)
 
46
 
 
47
 
 
48
class TestReconciler(tests.TestCaseWithTransport):
 
49
 
 
50
    def test_reconciler_with_no_branch(self):
 
51
        repo = self.make_repository('repo')
 
52
        reconciler = Reconciler(repo.bzrdir)
 
53
        reconciler.reconcile()
 
54
        # no inconsistent parents should have been found
 
55
        # but the values should have been set.
 
56
        self.assertEqual(0, reconciler.inconsistent_parents)
 
57
        # and no garbage inventories
 
58
        self.assertEqual(0, reconciler.garbage_inventories)
 
59
        self.assertIs(None, reconciler.fixed_branch_history)
 
60
 
 
61
    def test_reconciler_finds_branch(self):
 
62
        a_branch = self.make_branch('a_branch')
 
63
        reconciler = Reconciler(a_branch.bzrdir)
 
64
        reconciler.reconcile()
 
65
 
 
66
        # It should have checked the repository, and the branch
 
67
        self.assertEqual(0, reconciler.inconsistent_parents)
 
68
        self.assertEqual(0, reconciler.garbage_inventories)
 
69
        self.assertIs(False, reconciler.fixed_branch_history)