← 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-22 21:20:30 UTC
  • mfrom: (3010.1.17 pack.read-locks)
  • Revision ID: pqm@pqm.ubuntu.com-20071122212030-ehfexlt3qzptnsdv
(robertc) Various lock and write-group correctness issues which show
        up when packs are the default format. (Robert Collins, #154204).

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 = ""
45
49
        self.assertEqualDiff(out, "Reconciling repository %s\n"
46
 
                                  "Inventory ok.\n"
 
50
                                  "%s"
47
51
                                  "Reconciliation complete.\n" %
48
 
                                  t.bzrdir.root_transport.base)
 
52
                                  (t.bzrdir.root_transport.base,
 
53
                                   does_backup_text))
49
54
        self.assertEqualDiff(err, "")
50
55
 
51
56
    def test_does_something_reconcile(self):
60
65
        repo.commit_write_group()
61
66
        repo.unlock()
62
67
        (out, err) = self.run_bzr('reconcile')
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)
 
68
        if repo._reconcile_backsup_inventory:
 
69
            does_backup_text = (
 
70
                "Backup Inventory created.\n"
 
71
                "Inventory regenerated.\n")
 
72
        else:
 
73
            does_backup_text = ""
 
74
        expected = ("Reconciling repository %s\n"
 
75
                    "%s"
 
76
                    "Reconciliation complete.\n" %
 
77
                    (t.bzrdir.root_transport.base, does_backup_text))
 
78
        self.assertEqualDiff(expected, out)
68
79
        self.assertEqualDiff(err, "")