[Python-checkins] bpo-33937: Catch ENOMEM error in test_socket (GH-9557)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/857b0028c0832c3159927489bc55f802bc5146cb
commit: 857b0028c0832c3159927489bc55f802bc5146cb
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-09-25T09:00:51-07:00
summary:

bpo-33937: Catch ENOMEM error in test_socket (GH-9557)


Fix test_socket.SendmsgSCTPStreamTest: catch ENOMEM error.
testSendmsgTimeout() and testSendmsgDontWait() randomly fail on
Travis CI with: "OSError: [Errno 12] Cannot allocate memory".
(cherry picked from commit 46f40be8b907854deb81c6132b7cb038e9e5202a)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
M Lib/test/test_socket.py

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index cd249ff9b444..f8559ac4eab9 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -2287,9 +2287,18 @@ def testSendmsgTimeout(self):
     def _testSendmsgTimeout(self):
         try:
             self.cli_sock.settimeout(0.03)
-            with self.assertRaises(socket.timeout):
+            try:
                 while True:
                     self.sendmsgToServer([b"a"*512])
+            except socket.timeout:
+                pass
+            except OSError as exc:
+                if exc.errno != errno.ENOMEM:
+                    raise
+                # bpo-33937 the test randomly fails on Travis CI with
+                # "OSError: [Errno 12] Cannot allocate memory"
+            else:
+                self.fail("socket.timeout not raised")
         finally:
             self.misc_event.set()
 
@@ -2312,8 +2321,10 @@ def _testSendmsgDontWait(self):
             with self.assertRaises(OSError) as cm:
                 while True:
                     self.sendmsgToServer([b"a"*512], [], socket.MSG_DONTWAIT)
+            # bpo-33937: catch also ENOMEM, the test randomly fails on Travis CI
+            # with "OSError: [Errno 12] Cannot allocate memory"
             self.assertIn(cm.exception.errno,
-                          (errno.EAGAIN, errno.EWOULDBLOCK))
+                          (errno.EAGAIN, errno.EWOULDBLOCK, errno.ENOMEM))
         finally:
             self.misc_event.set()