~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/tests/http_server.py

Committer: Vincent Ladeuil
Date: 2008-09-26 15:28:29 UTC
mto: (3741.2.1 trunk) (3856.1.2 bzr.integration) (3933.1.1 bzr.integration) (3734.2.10 py26-compat)
mto: This revision was merged to the branch mainline in revision 3751.
Revision ID: v.ladeuil+lp@free.fr-20080926152829-ibdag0hw352qjcix

Catch spurious exceptions (python-2.6) when SocketServer is shut down.

* bzrlib/tests/test_http.py:
(TestProxyHttpServer.proxied_in_env,
TestProxyHttpServer.not_proxied_in_env): Revert expected and
actual expressions to conform with bzr rules.

* bzrlib/tests/http_server.py:
(HttpServer.__repr__): Added for debug purposes.
(HttpServer._http_start): Catch spurious exceptions when running
with python-2.6.

files modified:
bzrlib/tests/http_server.py

bzrlib/tests/test_http.py

Show diffs side-by-side

added added

removed removed

bzrlib/tests/http_server.py

import posixpath

import random

import re

import select

import SimpleHTTPServer

import socket

import SocketServer

418

419

# Allows tests to verify number of GET requests issued

419

420

self.GET_request_nb = 0

420

421

422

def __repr__(self):

423

return "%s(%s:%s)" % \

424

(self.__class__.__name__, self.host, self.port)

425

421

426

def _get_httpd(self):

422

427

if self._httpd is None:

423

428

rhandler = self.request_handler

467

472

httpd.handle_request()

468

473

except socket.timeout:

469

474

pass

475

except (socket.error, select.error), e:

476

if e[0] == errno.EBADF:

477

# Starting with python-2.6, handle_request may raise socket

478

# or select exceptions when the server is shut down (as we

479

# do).

480

pass

481

else:

482

raise

470

483

471

484

def _get_remote_url(self, path):

472

485

path_parts = path.split(os.path.sep)

Older »