Rev 5400: (vila) Catch EPIPE when shutting down test servers. (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5400 [merge]
revision-id: pqm at pqm.ubuntu.com-20100901064557-qsxmjmp195ozbluf
parent: pqm at pqm.ubuntu.com-20100831101633-ta0o6c60gy2pc0as
parent: v.ladeuil+lp at free.fr-20100831082515-an9mtdmhalo7xaq0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-09-01 07:45:57 +0100
message:
  (vila) Catch EPIPE when shutting down test servers. (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_server.py    test_server.py-20100209163834-im1ozfuenfmqaa2m-1
=== modified file 'NEWS'
--- a/NEWS	2010-08-31 08:57:28 +0000
+++ b/NEWS	2010-09-01 06:45:57 +0000
@@ -111,6 +111,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