~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Robert Collins
  • Date: 2005-10-19 06:33:38 UTC
  • Revision ID: robertc@robertcollins.net-20051019063338-45b891502a09911c
The HTTP transport would return NoSuchFile inappropriately.

bzrlib.transport.http has been modified so that only 404 urllib errors
are returned as NoSuchFile. Other exceptions will propogate as normal.
This allows debuging of actual errors. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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"
118
 
                 "blah blah blah blah blah blah blah")
 
117
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah")
119
118
        merge(["./branch", -1], [None, None], this_dir = './copy')
120
119
        message = self.status_string(b_2)
121
120
        assert (message.startswith("pending merges:\n")), message