← 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-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
42
42
    def test_trivial_reconcile(self):
43
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
44
44
        (out, err) = self.run_bzr('reconcile')
45
 
        if t.branch.repository._reconcile_backsup_inventory:
46
 
            does_backup_text = "Inventory ok.\n"
47
 
        else:
48
 
            does_backup_text = ""
49
 
        self.assertEqualDiff(out, "Reconciling branch %s\n"
50
 
                                  "revision_history ok.\n"
51
 
                                  "Reconciling repository %s\n"
52
 
                                  "%s"
 
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
46
                                  "Inventory ok.\n"
53
47
                                  "Reconciliation complete.\n" %
54
 
                                  (t.branch.base,
55
 
                                   t.bzrdir.root_transport.base,
56
 
                                   does_backup_text))
 
48
                                  t.bzrdir.root_transport.base)
57
49
        self.assertEqualDiff(err, "")
58
50
 
59
51
    def test_does_something_reconcile(self):
68
60
        repo.commit_write_group()
69
61
        repo.unlock()
70
62
        (out, err) = self.run_bzr('reconcile')
71
 
        if repo._reconcile_backsup_inventory:
72
 
            does_backup_text = (
73
 
                "Backup Inventory created.\n"
74
 
                "Inventory regenerated.\n")
75
 
        else:
76
 
            does_backup_text = ""
77
 
        expected = ("Reconciling branch %s\n"
78
 
                    "revision_history ok.\n"
79
 
                    "Reconciling repository %s\n"
80
 
                    "%s"
81
 
                    "Reconciliation complete.\n" %
82
 
                    (t.branch.base,
83
 
                     t.bzrdir.root_transport.base,
84
 
                     does_backup_text))
85
 
        self.assertEqualDiff(expected, out)
 
63
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
64
                                  "Backup Inventory created.\n"
 
65
                                  "Inventory regenerated.\n"
 
66
                                  "Reconciliation complete.\n" %
 
67
                                  t.bzrdir.root_transport.base)
86
68
        self.assertEqualDiff(err, "")