/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/test_test_server.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_test_server.py
1
 
# Copyright (C) 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
import errno
18
18
import socket
19
 
try:
20
 
    import socketserver
21
 
except ImportError:
22
 
    import SocketServer as socketserver
 
19
import SocketServer
23
20
import threading
24
21
 
25
22
 
26
 
from breezy import (
 
23
from bzrlib import (
27
24
    osutils,
28
25
    tests,
29
26
    )
30
 
from breezy.tests import test_server
31
 
from breezy.tests.scenarios import load_tests_apply_scenarios
 
27
from bzrlib.tests import test_server
 
28
from bzrlib.tests.scenarios import load_tests_apply_scenarios
32
29
 
33
30
 
34
31
load_tests = load_tests_apply_scenarios
65
62
            try:
66
63
                self.sock.shutdown(socket.SHUT_RDWR)
67
64
                self.sock.close()
68
 
            except socket.error as e:
 
65
            except socket.error, e:
69
66
                if e[0] in (errno.EBADF, errno.ENOTCONN):
70
67
                    # Right, the socket is already down
71
68
                    pass
80
77
        return self.sock.recv(bufsize)
81
78
 
82
79
 
83
 
class TCPConnectionHandler(socketserver.BaseRequestHandler):
 
80
class TCPConnectionHandler(SocketServer.BaseRequestHandler):
84
81
 
85
82
    def handle(self):
86
83
        self.done = False
136
133
 
137
134
    def assertClientAddr(self, client, server, conn_rank):
138
135
        conn = self.get_server_connection(server, conn_rank)
139
 
        self.assertEqual(client.sock.getsockname(), conn[1])
 
136
        self.assertEquals(client.sock.getsockname(), conn[1])
140
137
 
141
138
    def test_start_stop(self):
142
139
        server = self.get_server()
155
152
        self.assertIs(None, client.write('ping\n'))
156
153
        resp = client.read()
157
154
        self.assertClientAddr(client, server, 0)
158
 
        self.assertEqual('pong\n', resp)
 
155
        self.assertEquals('pong\n', resp)
159
156
 
160
157
    def test_server_fails_to_start(self):
161
158
        class CantStart(Exception):
191
188
        client.write('ping\n')
192
189
        try:
193
190
            self.assertEqual('', client.read())
194
 
        except socket.error as e:
 
191
        except socket.error, e:
195
192
            # On Windows, failing during 'handle' means we get
196
193
            # 'forced-close-of-connection'. Possibly because we haven't
197
194
            # processed the write request before we close the socket.
269
266
 
270
267
        server = self.get_server(
271
268
            connection_handler_class=FailingWhileServingConnectionHandler)
272
 
        self.assertEqual(True, server.server.serving)
 
269
        self.assertEquals(True, server.server.serving)
273
270
        # Install the exception swallower
274
271
        server.set_ignored_exceptions(CantServe)
275
272
        client = self.get_client()