← 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-04-26 21:11:03 UTC
  • mfrom: (2447.1.7 bundle_empty_properties)
  • Revision ID: pqm@pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
(John Arbash Meinel) Fix bug #109613 by teaching Bundle how to properly read/write revision properties with no value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
41
41
 
42
42
    def test_trivial_reconcile(self):
43
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
44
 
        (out, err) = self.run_bzr(['reconcile'])
 
44
        (out, err) = self.run_bzr_captured(['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(['reconcile'])
 
58
        (out, err) = self.run_bzr_captured(['reconcile'])
59
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"
60
60
                                  "Backup Inventory created.\n"
61
61
                                  "Inventory regenerated.\n"