From: Giampaolo Rodola <g.rodola@gmail.com>
Date: Tue, 10 Dec 2019 09:31:06 +0000 (+0800)
Subject: bpo-39004: increment large sendfile() test timeout (GH-17552)
X-Git-Tag: v3.9.0a2~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82374979ec7e01e23385dca1d02b2aa3de16fea5;p=thirdparty%2FPython%2Fcpython.git

bpo-39004: increment large sendfile() test timeout (GH-17552)
---

diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
index 6c8813e06260..e309282d73e2 100644
--- a/Lib/test/test_largefile.py
+++ b/Lib/test/test_largefile.py
@@ -9,6 +9,7 @@ import socket
 import shutil
 import threading
 from test.support import TESTFN, requires, unlink, bigmemtest, find_unused_port
+from test.support import SHORT_TIMEOUT
 import io  # C implementation of io
 import _pyio as pyio # Python implementation of io
 
@@ -168,7 +169,7 @@ class TestCopyfile(LargeFileTest, unittest.TestCase):
 @unittest.skipIf(not hasattr(os, 'sendfile'), 'sendfile not supported')
 class TestSocketSendfile(LargeFileTest, unittest.TestCase):
     open = staticmethod(io.open)
-    timeout = 3
+    timeout = SHORT_TIMEOUT
 
     def setUp(self):
         super().setUp()
@@ -184,6 +185,7 @@ class TestSocketSendfile(LargeFileTest, unittest.TestCase):
         def run(sock):
             with sock:
                 conn, _ = sock.accept()
+                conn.settimeout(self.timeout)
                 with conn, open(TESTFN2, 'wb') as f:
                     event.wait(self.timeout)
                     while True: