← 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

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
46
46
            does_backup_text = "Inventory ok.\n"
47
47
        else:
48
48
            does_backup_text = ""
49
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
49
        self.assertEqualDiff(out, "Reconciling branch %s\n"
 
50
                                  "revision_history ok.\n"
 
51
                                  "Reconciling repository %s\n"
50
52
                                  "%s"
51
53
                                  "Reconciliation complete.\n" %
52
 
                                  (t.bzrdir.root_transport.base,
 
54
                                  (t.branch.base,
 
55
                                   t.bzrdir.root_transport.base,
53
56
                                   does_backup_text))
54
57
        self.assertEqualDiff(err, "")
55
58
 
71
74
                "Inventory regenerated.\n")
72
75
        else:
73
76
            does_backup_text = ""
74
 
        expected = ("Reconciling repository %s\n"
 
77
        expected = ("Reconciling branch %s\n"
 
78
                    "revision_history ok.\n"
 
79
                    "Reconciling repository %s\n"
75
80
                    "%s"
76
81
                    "Reconciliation complete.\n" %
77
 
                    (t.bzrdir.root_transport.base, does_backup_text))
 
82
                    (t.branch.base,
 
83
                     t.bzrdir.root_transport.base,
 
84
                     does_backup_text))
78
85
        self.assertEqualDiff(expected, out)
79
86
        self.assertEqualDiff(err, "")