/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 bzrlib/tests/HTTPTestUtil.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-12 14:29:32 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061012142932-7221fe16d2b48fa3
Shuffle http related test code. Hopefully it ends up at the right place :)

* bzrlib/tests/HttpServer.py: 
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).

* bzrlib/transport/http/_urllib.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/_pycurl.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/__init__.py: 
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.

* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.

* bzrlib/tests/test_repository.py: 
Does *not* use HttpServer.

* bzrlib/tests/test_http.py: 
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.

* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/HTTPTestUtil.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
 
17
import errno
 
18
import socket
18
19
 
19
 
import bzrlib
20
20
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests.HttpServer import (
 
22
    HttpServer,
 
23
    TestingHTTPRequestHandler,
 
24
    )
 
25
 
 
26
 
 
27
class WallRequestHandler(TestingHTTPRequestHandler):
 
28
    """Whatever request comes in, close the connection"""
 
29
 
 
30
    def handle_one_request(self):
 
31
        """Handle a single HTTP request, by abruptly closing the connection"""
 
32
        self.close_connection = 1
 
33
 
 
34
 
 
35
class BadStatusRequestHandler(TestingHTTPRequestHandler):
 
36
    """Whatever request comes in, returns a bad status"""
 
37
 
 
38
    def parse_request(self):
 
39
        """Fakes handling a single HTTP request, returns a bad status"""
 
40
        ignored = TestingHTTPRequestHandler.parse_request(self)
 
41
        try:
 
42
            self.send_response(0, "Bad status")
 
43
            self.end_headers()
 
44
        except socket.error, e:
 
45
            if (len(e.args) > 0) and (e.args[0] == errno.EPIPE):
 
46
                # We don't want to pollute the test reuslts with
 
47
                # spurious server errors while test succeed. In
 
48
                # our case, it may occur that the test have
 
49
                # already read the 'Bad Status' and closed the
 
50
                # socket while we are still trying to send some
 
51
                # headers... So the test is ok but if we raise
 
52
                # the exception the output is dirty. So we don't
 
53
                # raise, but we close the connection, just to be
 
54
                # safe :)
 
55
                self.close_connection = 1
 
56
                pass
 
57
            else:
 
58
                raise
 
59
        return False
 
60
 
 
61
 
 
62
class InvalidStatusRequestHandler(TestingHTTPRequestHandler):
 
63
    """Whatever request comes in, returns am invalid status"""
 
64
 
 
65
    def parse_request(self):
 
66
        """Fakes handling a single HTTP request, returns a bad status"""
 
67
        ignored = TestingHTTPRequestHandler.parse_request(self)
 
68
        self.wfile.write("Invalid status line\r\n")
 
69
        return False
 
70
 
 
71
 
 
72
class BadProtocolRequestHandler(TestingHTTPRequestHandler):
 
73
    """Whatever request comes in, returns a bad protocol version"""
 
74
 
 
75
    def parse_request(self):
 
76
        """Fakes handling a single HTTP request, returns a bad status"""
 
77
        ignored = TestingHTTPRequestHandler.parse_request(self)
 
78
        # Returns an invalid protocol version, but curl just
 
79
        # ignores it and those cannot be tested.
 
80
        self.wfile.write("%s %d %s\r\n" % ('HTTP/0.0',
 
81
                                           404,
 
82
                                           'Look at my protocol version'))
 
83
        return False
21
84
 
22
85
 
23
86
class TestCaseWithWebserver(TestCaseWithTransport):
29
92
    """
30
93
    def setUp(self):
31
94
        super(TestCaseWithWebserver, self).setUp()
32
 
        self.transport_readonly_server = bzrlib.transport.http.HttpServer
 
95
        self.transport_readonly_server = HttpServer