Rev 5287: Catch EPIPE during test server shutdown. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5287
revision-id: v.ladeuil+lp at free.fr-20100831082417-7p8w4k94go3x8kbr
parent: v.ladeuil+lp at free.fr-20100830072439-9uk11486wi949i95
fixes bug(s): https://launchpad.net/bugs/627277
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: more-ignored-exceptions
timestamp: Tue 2010-08-31 10:24:17 +0200
message:
  Catch EPIPE during test server shutdown.
  
  * bzrlib/tests/test_server.py:
  (TestingTCPServerMixin.ignored_exceptions_during_shutdown): EPIPE
  should be expected.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-08-24 13:01:57 +0000
+++ b/NEWS	2010-08-31 08:24:17 +0000
@@ -76,6 +76,9 @@
 * Don't print internal object name when print an invalid revision spec
   error.  (Neil Martinsen-Burrell, #598701)
 
+* ``EPIPE`` can be raised during test server shutdown. This happened on
+  gentoo only so far. (Vincent Ladeuil, #627277)
+
 * Errors occurring during http(s) test server starts should now be
   handled cleanly. (Vincent Ladeuil, #392402)
 

=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-08-24 16:07:33 +0000
+++ b/bzrlib/tests/test_server.py	2010-08-31 08:24:17 +0000
@@ -424,10 +424,19 @@
 
     def ignored_exceptions_during_shutdown(self, e):
         if sys.platform == 'win32':
-            accepted_errnos = [errno.EBADF, errno.WSAEBADF, errno.WSAENOTCONN,
-                               errno.WSAECONNRESET, errno.WSAESHUTDOWN]
+            accepted_errnos = [errno.EBADF,
+                               errno.EPIPE,
+                               errno.WSAEBADF,
+                               errno.WSAECONNRESET,
+                               errno.WSAENOTCONN,
+                               errno.WSAESHUTDOWN,
+                               ]
         else:
-            accepted_errnos = [errno.EBADF, errno.ENOTCONN, errno.ECONNRESET]
+            accepted_errnos = [errno.EBADF,
+                               errno.ECONNRESET,
+                               errno.ENOTCONN,
+                               errno.EPIPE,
+                               ]
         if isinstance(e, socket.error) and e[0] in accepted_errnos:
             return True
         return False