/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_http.py

  • Committer: Jelmer Vernooij
  • Date: 2017-10-26 11:10:38 UTC
  • mfrom: (6791.2.7 python3)
  • Revision ID: jelmer@jelmer.uk-20171026111038-cvils4aykn7ffcju
Merge lp:~jelmer/brz/fix-imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_http.py
23
23
# TODO: Should be renamed to breezy.transport.http.tests?
24
24
# TODO: What about renaming to breezy.tests.transport.http ?
25
25
 
26
 
import httplib
 
26
try:
 
27
    from http.client import UnknownProtocol
 
28
    from http.server import SimpleHTTPRequestHandler
 
29
except ImportError:  # python < 3
 
30
    from httplib import UnknownProtocol
 
31
    from SimpleHTTPServer import SimpleHTTPRequestHandler
27
32
import io
28
 
import SimpleHTTPServer
29
33
import socket
30
34
import sys
31
35
import threading
307
311
 
308
312
            protocol_version = 'HTTP/0.1'
309
313
 
310
 
        self.assertRaises(httplib.UnknownProtocol,
 
314
        self.assertRaises(UnknownProtocol,
311
315
                          http_server.HttpServer, BogusRequestHandler)
312
316
 
313
317
    def test_force_invalid_protocol(self):
314
 
        self.assertRaises(httplib.UnknownProtocol,
 
318
        self.assertRaises(UnknownProtocol,
315
319
                          http_server.HttpServer, protocol_version='HTTP/0.1')
316
320
 
317
321
    def test_server_start_and_stop(self):
863
867
        # Update the statistics
864
868
        self.server.test_case_server.GET_request_nb += 1
865
869
        # Just bypass the range handling done by TestingHTTPRequestHandler
866
 
        return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
 
870
        return SimpleHTTPRequestHandler.do_GET(self)
867
871
 
868
872
 
869
873
class TestNoRangeRequestServer(TestRangeRequestServer):