← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 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
22
22
from bzrlib.inventory import Inventory
23
23
import bzrlib.repository as repository
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests.blackbox import TestUIFactory
 
25
from bzrlib.tests import TestUIFactory
26
26
from bzrlib.transport import get_transport
27
27
import bzrlib.ui as ui
28
28
 
41
41
 
42
42
    def test_trivial_reconcile(self):
43
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
44
 
        (out, err) = self.run_bzr_captured(['reconcile'])
 
44
        (out, err) = self.run_bzr(['reconcile'])
45
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
46
46
                                  "Inventory ok.\n"
47
47
                                  "Reconciliation complete.\n" %
55
55
        inv = Inventory(revision_id='missing')
56
56
        inv.root.revision='missing'
57
57
        repo.add_inventory('missing', inv, [])
58
 
        (out, err) = self.run_bzr_captured(['reconcile'])
 
58
        (out, err) = self.run_bzr(['reconcile'])
59
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"
60
60
                                  "Backup Inventory created.\n"
61
61
                                  "Inventory regenerated.\n"