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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-11-07 15:19:45 UTC
  • mfrom: (3823.2.1 bzr.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20081107151945-hwdojxj8yafpk350
Fix bug #293054: handlle ssl sockets in a python-2.6 compatible way

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
347
347
             # WSAENOTCONN (10057) 'Socket is not connected' is harmless on
348
348
             # windows (occurs before the first connection attempt
349
349
             # vila--20071230)
350
 
             if not len(e.args) or e.args[0] != 10057:
 
350
 
 
351
             # 'Socket is not connected' can also occur on OSX, with a
 
352
             # "regular" ENOTCONN (when something went wrong during test case
 
353
             # setup leading to self.setUp() *not* being called but
 
354
             # self.tearDown() still being called -- vila20081106
 
355
             if not len(e.args) or e.args[0] not in (errno.ENOTCONN, 10057):
351
356
                 raise
352
357
         # Let the server properly close the socket
353
358
         self.server_close()