~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_status.py

  • Committer: Martin Pool
  • Date: 2007-02-21 07:59:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2297.
  • Revision ID: mbp@sourcefrog.net-20070221075917-aum4hz1p7nirak7l
Make tests for truncation of status output more robust on wide terminals.

(Relates to bug #56011)

Show diffs side-by-side

added added

removed removed

Lines of Context:
143
143
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
144
144
        merge(["./branch", -1], [None, None], this_dir = './copy')
145
145
        message = self.status_string(wt2)
146
 
        self.assert_(message.startswith("pending merges:\n"))
147
 
        self.assert_(message.endswith("Empty commit 2\n")) 
 
146
        self.assertStartsWith(message, "pending merges:\n")
 
147
        self.assertEndsWith(message, "Empty commit 2\n")
148
148
        wt2.commit("merged")
149
149
        # must be long to make sure we see elipsis at the end
150
 
        wt.commit("Empty commit 3 " + 
151
 
                   "blah blah blah blah " * 10)
 
150
        wt.commit("Empty commit 3 " +
 
151
                   "blah blah blah blah " * 100)
152
152
        merge(["./branch", -1], [None, None], this_dir = './copy')
153
153
        message = self.status_string(wt2)
154
 
        self.assert_(message.startswith("pending merges:\n"))
 
154
        self.assertStartsWith(message, "pending merges:\n")
155
155
        self.assert_("Empty commit 3" in message)
156
 
        self.assert_(message.endswith("...\n")) 
 
156
        self.assertEndsWith(message, "...\n")
157
157
 
158
158
    def test_branch_status_specific_files(self): 
159
159
        """Tests branch status with given specific files"""