← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

Make commit message long enough in test for pending merges
so that we see the elipsis characters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
114
114
        assert (message.startswith("pending merges:\n")), message
115
115
        assert (message.endswith("Empty commit 2\n")), message 
116
116
        b_2.commit("merged")
117
 
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah")
 
117
        # must be long to make sure we see elipsis at the end
 
118
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
 
119
                 " blah blah blah blah blah blah bleh")
118
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
119
121
        message = self.status_string(b_2)
120
122
        assert (message.startswith("pending merges:\n")), message