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

  • Committer: John Arbash Meinel
  • Date: 2010-09-01 18:43:13 UTC
  • mfrom: (5404 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5405.
  • Revision ID: john@arbash-meinel.com-20100901184313-c9g2gxkmfqq7ofco
Merge bzr.dev 5404

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
424
424
 
425
425
    def ignored_exceptions_during_shutdown(self, e):
426
426
        if sys.platform == 'win32':
427
 
            accepted_errnos = [errno.EBADF, errno.WSAEBADF, errno.WSAENOTCONN,
428
 
                               errno.WSAECONNRESET, errno.WSAESHUTDOWN]
 
427
            accepted_errnos = [errno.EBADF,
 
428
                               errno.EPIPE,
 
429
                               errno.WSAEBADF,
 
430
                               errno.WSAECONNRESET,
 
431
                               errno.WSAENOTCONN,
 
432
                               errno.WSAESHUTDOWN,
 
433
                               ]
429
434
        else:
430
 
            accepted_errnos = [errno.EBADF, errno.ENOTCONN, errno.ECONNRESET]
 
435
            accepted_errnos = [errno.EBADF,
 
436
                               errno.ECONNRESET,
 
437
                               errno.ENOTCONN,
 
438
                               errno.EPIPE,
 
439
                               ]
431
440
        if isinstance(e, socket.error) and e[0] in accepted_errnos:
432
441
            return True
433
442
        return False