bpo-33522: Enable CI builds on Visual Studio Team Services (GH-6865) (GH-6926)

(cherry picked from commit e5f41d2f1e)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
This commit is contained in:
Miss Islington (bot) 2018-05-17 05:49:01 -07:00 committed by Steve Dower
parent 54a5247837
commit 8965d75c90
22 changed files with 603 additions and 25 deletions

View file

@ -179,7 +179,8 @@ class DummyPOP3Handler(asynchat.async_chat):
elif err.args[0] == ssl.SSL_ERROR_EOF:
return self.handle_close()
# TODO: SSLError does not expose alert information
elif "SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1]:
elif ("SSLV3_ALERT_BAD_CERTIFICATE" in err.args[1] or
"SSLV3_ALERT_CERTIFICATE_UNKNOWN" in err.args[1]):
return self.handle_close()
raise
except OSError as err:
@ -222,11 +223,12 @@ class DummyPOP3Server(asyncore.dispatcher, threading.Thread):
def run(self):
self.active = True
self.__flag.set()
while self.active and asyncore.socket_map:
self.active_lock.acquire()
asyncore.loop(timeout=0.1, count=1)
self.active_lock.release()
asyncore.close_all(ignore_all=True)
try:
while self.active and asyncore.socket_map:
with self.active_lock:
asyncore.loop(timeout=0.1, count=1)
finally:
asyncore.close_all(ignore_all=True)
def stop(self):
assert self.active