From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 13 Nov 2018 01:24:39 +0000 (-0800)
Subject: bpo-35031: Fix test_start_tls_server_1 on FreeBSD buildbots (GH-10011)
X-Git-Tag: v3.7.2rc1~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f9fe53c98978955fea4e36456c784694e6458a8;p=thirdparty%2FPython%2Fcpython.git

bpo-35031: Fix test_start_tls_server_1 on FreeBSD buildbots (GH-10011)


Some FreeBSD buildbots fail to run this test as the eof was not being received by the server if the size is not big enough. This behaviour only appears if the client is using TLS1.3.
(cherry picked from commit f6a47f3e316cede2a07a1f74a509f6d80ab8fef0)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 46a1523ea1ec..44ae3b67e0bd 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -2,6 +2,7 @@
 
 import logging
 import socket
+import sys
 import unittest
 from unittest import mock
 try:
@@ -426,6 +427,12 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
 
         server_context = test_utils.simple_server_sslcontext()
         client_context = test_utils.simple_client_sslcontext()
+        if sys.platform.startswith('freebsd'):
+            # bpo-35031: Some FreeBSD buildbots fail to run this test
+            # as the eof was not being received by the server if the payload
+            # size is not big enough. This behaviour only appears if the
+            # client is using TLS1.3.
+            client_context.options |= ssl.OP_NO_TLSv1_3
 
         def client(sock, addr):
             sock.settimeout(self.TIMEOUT)