← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

Merged Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
111
111
        b.commit("Empty commit 2")
112
112
        merge(["./branch", -1], [None, None], this_dir = './copy')
113
113
        message = self.status_string(b_2)
114
 
        assert (message.startswith("pending merges:\n")), message
115
 
        assert (message.endswith("Empty commit 2\n")), message 
 
114
        self.assert_(message.startswith("pending merges:\n"))
 
115
        self.assert_(message.endswith("Empty commit 2\n")) 
116
116
        b_2.commit("merged")
117
117
        # must be long to make sure we see elipsis at the end
118
118
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
119
119
                 " blah blah blah blah blah blah bleh")
120
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
121
        message = self.status_string(b_2)
122
 
        assert (message.startswith("pending merges:\n")), message
123
 
        assert ("Empty commit 3" in message), message
124
 
        assert (message.endswith("...\n")), message 
 
122
        self.assert_(message.startswith("pending merges:\n"))
 
123
        self.assert_("Empty commit 3" in message)
 
124
        self.assert_(message.endswith("...\n")) 
125
125
 
126
126
    def test_branch_status_specific_files(self): 
127
127
        """Tests branch status with given specific files"""