← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
161
161
 
162
162
class RecordingServer(object):
163
163
    """A fake HTTP server.
164
 
    
 
164
 
165
165
    It records the bytes sent to it, and replies with a 200.
166
166
    """
167
167
 
800
800
        # bytes on the socket
801
801
        ireadv = iter(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
802
802
        self.assertEqual((0, '0'), ireadv.next())
803
 
        # The server should have issued one request so far 
 
803
        # The server should have issued one request so far
804
804
        self.assertEqual(1, server.GET_request_nb)
805
805
        self.assertEqual('0123456789', t.get_bytes('a'))
806
806
        # get_bytes issued an additional request, the readv pending ones are