bpo-29184: Skip test_socketserver tests on PermissionError raised by Android (GH-4387)
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index a23373f..6584ba5 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -60,10 +60,14 @@
if pid == 0:
# Don't raise an exception; it would be caught by the test harness.
os._exit(72)
- yield None
- pid2, status = os.waitpid(pid, 0)
- testcase.assertEqual(pid2, pid)
- testcase.assertEqual(72 << 8, status)
+ try:
+ yield None
+ except:
+ raise
+ finally:
+ pid2, status = os.waitpid(pid, 0)
+ testcase.assertEqual(pid2, pid)
+ testcase.assertEqual(72 << 8, status)
class SocketServerTest(unittest.TestCase):
@@ -108,7 +112,12 @@
self.wfile.write(line)
if verbose: print("creating server")
- server = MyServer(addr, MyHandler)
+ try:
+ server = MyServer(addr, MyHandler)
+ except PermissionError as e:
+ # Issue 29184: cannot bind() a Unix socket on Android.
+ self.skipTest('Cannot create server (%s, %s): %s' %
+ (svrcls, addr, e))
self.assertEqual(server.server_address, server.socket.getsockname())
return server