← 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: Canonical.com Patch Queue Manager
  • Date: 2007-03-28 06:58:22 UTC
  • mfrom: (2379.2.3 hpss-chroot)
  • Revision ID: pqm@pqm.ubuntu.com-20070328065822-999550a858a3ced3
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
from bzrlib import (
21
 
    controldir,
22
 
    inventory,
23
 
    tests,
24
 
    )
25
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
 
 
27
 
 
28
 
class TrivialTest(tests.TestCaseWithTransport):
 
20
import bzrlib
 
21
import bzrlib.bzrdir as bzrdir
 
22
from bzrlib.inventory import Inventory
 
23
import bzrlib.repository as repository
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tests import TestUIFactory
 
26
from bzrlib.transport import get_transport
 
27
import bzrlib.ui as ui
 
28
 
 
29
 
 
30
class TrivialTest(TestCaseWithTransport):
 
31
 
 
32
    def setUp(self):
 
33
        super(TrivialTest, self).setUp()
 
34
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
35
        self.old_ui_factory = ui.ui_factory
 
36
        self.addCleanup(self.restoreDefaults)
 
37
        ui.ui_factory = TestUIFactory()
 
38
 
 
39
    def restoreDefaults(self):
 
40
        ui.ui_factory = self.old_ui_factory
29
41
 
30
42
    def test_trivial_reconcile(self):
31
 
        t = controldir.ControlDir.create_standalone_workingtree('.')
32
 
        (out, err) = self.run_bzr('reconcile')
33
 
        if t.branch.repository._reconcile_backsup_inventory:
34
 
            does_backup_text = "Inventory ok.\n"
35
 
        else:
36
 
            does_backup_text = ""
37
 
        self.assertEqualDiff(out, "Reconciling branch %s\n"
38
 
                                  "revision_history ok.\n"
39
 
                                  "Reconciling repository %s\n"
40
 
                                  "%s"
 
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
44
        (out, err) = self.run_bzr_captured(['reconcile'])
 
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
46
                                  "Inventory ok.\n"
41
47
                                  "Reconciliation complete.\n" %
42
 
                                  (t.branch.base,
43
 
                                   t.bzrdir.root_transport.base,
44
 
                                   does_backup_text))
 
48
                                  t.bzrdir.root_transport.base)
45
49
        self.assertEqualDiff(err, "")
46
50
 
47
51
    def test_does_something_reconcile(self):
48
 
        t = controldir.ControlDir.create_standalone_workingtree('.')
 
52
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
49
53
        # an empty inventory with no revision will trigger reconciliation.
50
54
        repo = t.branch.repository
51
 
        inv = inventory.Inventory(revision_id='missing')
 
55
        inv = Inventory(revision_id='missing')
52
56
        inv.root.revision='missing'
53
 
        repo.lock_write()
54
 
        repo.start_write_group()
55
57
        repo.add_inventory('missing', inv, [])
56
 
        repo.commit_write_group()
57
 
        repo.unlock()
58
 
        (out, err) = self.run_bzr('reconcile')
59
 
        if repo._reconcile_backsup_inventory:
60
 
            does_backup_text = (
61
 
                "Backup Inventory created.\n"
62
 
                "Inventory regenerated.\n")
63
 
        else:
64
 
            does_backup_text = ""
65
 
        expected = ("Reconciling branch %s\n"
66
 
                    "revision_history ok.\n"
67
 
                    "Reconciling repository %s\n"
68
 
                    "%s"
69
 
                    "Reconciliation complete.\n" %
70
 
                    (t.branch.base,
71
 
                     t.bzrdir.root_transport.base,
72
 
                     does_backup_text))
73
 
        self.assertEqualDiff(expected, out)
 
58
        (out, err) = self.run_bzr_captured(['reconcile'])
 
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
60
                                  "Backup Inventory created.\n"
 
61
                                  "Inventory regenerated.\n"
 
62
                                  "Reconciliation complete.\n" %
 
63
                                  t.bzrdir.root_transport.base)
74
64
        self.assertEqualDiff(err, "")
75
 
 
76
 
 
77
 
class TestSmartServerReconcile(tests.TestCaseWithTransport):
78
 
 
79
 
    def test_simple_reconcile(self):
80
 
        self.setup_smart_server_with_call_log()
81
 
        self.make_branch('branch')
82
 
        self.reset_smart_call_log()
83
 
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
84
 
        # This figure represent the amount of work to perform this use case. It
85
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
86
 
        # being too low. If rpc_count increases, more network roundtrips have
87
 
        # become necessary for this use case. Please do not adjust this number
88
 
        # upwards without agreement from bzr's network support maintainers.
89
 
        self.assertLength(10, self.hpss_calls)
90
 
        self.assertLength(1, self.hpss_connections)
91
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)