Commit graph

72 commits

Author SHA1 Message Date
Antoine Pitrou
5b95eb90a7 Use context managers in test_ssl to simplify test writing. 2011-12-21 16:52:40 +01:00
Antoine Pitrou
cf9943de97 Backout redundant changeset 1de4d92cd6a4 2011-10-31 20:23:00 +01:00
Barry Warsaw
39aec0171d test_protocol_sslv2(): Skip this test if ssl.PROTOCOL_SSLv2 is not
defined (as is the case with Ubuntu 11.10).
2011-10-31 14:08:15 -04:00
Antoine Pitrou
6361ea2b07 Remove unstable SSL tests in the absence of ssl.OP_NO_{SSLv2,SSLv3,TLSv1} 2011-10-30 21:31:34 +01:00
Barry Warsaw
be83698f21 - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. 2011-10-28 16:14:44 -04:00
Antoine Pitrou
f06eb46918 Issue #13034: When decoding some SSL certificates, the subjectAltName extension could be unreported. 2011-10-01 19:30:58 +02:00
Victor Stinner
2e7f39e889 Issue #12012: test_ssl uses test_support.import_module()
Skip the whole file if the SSL module is missing. It was already the case,
except that the SkipTest exception was raised in test_main().

This commit fixes an error in test_ssl if the ssl module is missing.
2011-05-22 13:22:28 +02:00
Victor Stinner
b1241f9619 (Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional
OpenSSL is now compiled with OPENSSL_NO_SSL2 defined (without the SSLv2
protocol) on Debian: fix the ssl module on Debian Testing and Debian Sid.

Optimize also ssl.get_protocol_name(): speed does matter!
2011-05-10 01:52:03 +02:00
Antoine Pitrou
8ef3907044 Merged revisions 88671 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88671 | antoine.pitrou | 2011-02-27 16:44:12 +0100 (dim., 27 févr. 2011) | 3 lines

  Follow up to r88664: non-blocking connect-ex() can return EWOULDBLOCK under Windows
........
2011-02-27 15:45:22 +00:00
Antoine Pitrou
d3f6ea1d1e Merged revisions 88664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88664 | antoine.pitrou | 2011-02-27 00:24:06 +0100 (dim., 27 févr. 2011) | 4 lines

  Issue #11326: Add the missing connect_ex() implementation for SSL sockets,
  and make it work for non-blocking connects.
........
2011-02-26 23:35:27 +00:00
Antoine Pitrou
d43245a965 Merged revisions 87861,87863 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87861 | antoine.pitrou | 2011-01-08 11:23:29 +0100 (sam., 08 janv. 2011) | 3 lines

  Fix test_ssl after r87849
........
  r87863 | antoine.pitrou | 2011-01-08 11:28:11 +0100 (sam., 08 janv. 2011) | 3 lines

  Add EHOSTUNREACH ('No route to host') to the errnos trapped by transient_internet().
........
2011-01-08 10:32:51 +00:00
Antoine Pitrou
942d554c5b Don't fail in test_ssl when svn.python.org is unavailable 2010-10-31 13:26:53 +00:00
Antoine Pitrou
f7f390a251 Issue #9729: Fix the signature of SSLSocket.recvfrom() and
SSLSocket.sendto() to match the corresponding socket methods.  Also,
fix various SSLSocket methods to raise socket.error rather than an
unhelpful TypeError when called on an unconnected socket.  Original patch
by Andrew Bennetts.

NOTE: obviously, these methods are untested and unused in the real world...
2010-09-14 14:37:18 +00:00
Antoine Pitrou
de30f7042f Some tests didn't get executed (because of the merge in r83728) 2010-09-14 12:54:08 +00:00
Antoine Pitrou
4e406d8ff4 Merged revisions 84650 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84650 | antoine.pitrou | 2010-09-09 15:31:46 +0200 (jeu., 09 sept. 2010) | 4 lines

  Use transient_internet() where appropriate in test_ssl
  (svn.python.org is sometimes unavailable)
........
2010-09-09 13:35:44 +00:00
Antoine Pitrou
c818ed4d61 Merged revisions 84597-84599 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84597 | antoine.pitrou | 2010-09-07 22:42:19 +0200 (mar., 07 sept. 2010) | 5 lines

  Issue #8574: better implementation of test.support.transient_internet().
  Original patch by Victor.
........
  r84598 | antoine.pitrou | 2010-09-07 23:05:49 +0200 (mar., 07 sept. 2010) | 6 lines

  Issue #9792: In case of connection failure, socket.create_connection()
  would swallow the exception and raise a new one, making it impossible
  to fetch the original errno, or to filter timeout errors.  Now the
  original error is re-raised.
........
  r84599 | antoine.pitrou | 2010-09-07 23:09:09 +0200 (mar., 07 sept. 2010) | 4 lines

  Improve transient_internet() again to detect more network errors,
  and use it in test_robotparser. Fixes #8574.
........
2010-09-07 21:40:25 +00:00
Antoine Pitrou
b233b7d7b5 Merged revisions 84021-84023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84021 | antoine.pitrou | 2010-08-14 18:24:38 +0200 (sam., 14 août 2010) | 4 lines

  Add a reasonable timeout to network SSL tests, so as to avoid buildbot timeouts
  when the remote server doesn't answer.
........
  r84022 | antoine.pitrou | 2010-08-14 18:32:10 +0200 (sam., 14 août 2010) | 4 lines

  This is a better resolution than r84021 (because it will also affect
  ssl.get_server_certificate()).
........
  r84023 | antoine.pitrou | 2010-08-14 18:33:38 +0200 (sam., 14 août 2010) | 3 lines

  There doesn't seem to be a reason for this test to be disabled.
........
2010-08-14 17:28:36 +00:00
Antoine Pitrou
969fbe3d91 Don't crash when the _ssl module isn't built 2010-08-05 01:30:23 +00:00
Antoine Pitrou
d75efd9c56 Merged revisions 83727 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83727 | antoine.pitrou | 2010-08-04 19:14:06 +0200 (mer., 04 août 2010) | 3 lines

  Try to fix issue #9415: skip some tests on broken Ubuntu OpenSSL
........
2010-08-04 17:38:33 +00:00
Antoine Pitrou
1bbb68d37c self doesn't exist here 2010-05-06 14:11:23 +00:00
Antoine Pitrou
8651810df9 Remove duplicate test 2010-05-01 20:26:58 +00:00
Antoine Pitrou
3945c867d6 Fix style issues in test_ssl 2010-04-28 21:11:01 +00:00
Antoine Pitrou
4c7bcf1194 Issue #8086: In :func:ssl.DER_cert_to_PEM_cert(), fix missing newline
before the certificate footer.  Patch by Kyle VanderBeek.
2010-04-27 22:03:37 +00:00
Antoine Pitrou
9bf5425f5f socket.error can really happen here, and fix a possible NameError 2010-04-27 13:13:26 +00:00
Antoine Pitrou
db187847fb Qualify or remove or bare excepts. Simplify exception handling in places.
Remove uses of test_support.TestFailed.
2010-04-27 10:32:58 +00:00
Antoine Pitrou
435ba0cfb8 replace custom code with standard library functionality (HTTPServer.shutdown())
+ enable test that was never run (!)
+ make tests faster by lowering polling timeout
2010-04-27 09:51:18 +00:00
Antoine Pitrou
150acda57f Remove uses of find_unused_port() in test_ssl, and small cleanups 2010-04-27 08:40:51 +00:00
Antoine Pitrou
fc69af1562 Issue #5103: SSL handshake would ignore the socket timeout and block
indefinitely if the other end didn't respond.
2010-04-24 20:04:58 +00:00
Antoine Pitrou
55841ac1a5 Make test_makefile_close a networked test (can't read() from a non-connected
socket under OS X), and skip it under Windows (where sockets can't be read()
from using their fds).
2010-04-24 10:43:57 +00:00
Antoine Pitrou
b558f17b18 Issue #5238: Calling makefile() on an SSL object would prevent the
underlying socket from being closed until all objects get truely destroyed.
2010-04-23 23:25:45 +00:00
Antoine Pitrou
dfb299bb95 Issue #7943: Fix circular reference created when instantiating an SSL
socket.  Initial patch by Péter Szabó.
2010-04-23 22:54:59 +00:00
Antoine Pitrou
9aed604fb2 Skip test on old versions of OpenSSL 2010-04-22 18:00:41 +00:00
Antoine Pitrou
60b1ee375c Temporarily display OpenSSL version in verbose run -- trying to diagnose failure on Neal's buildbot. 2010-04-22 17:44:41 +00:00
Antoine Pitrou
c715a9ed08 Issue #8484: Load all ciphers and digest algorithms when initializing
the _ssl extension, such that verification of some SSL certificates
doesn't fail because of an "unknown algorithm".
2010-04-21 19:28:03 +00:00
Antoine Pitrou
0a6373c1a9 Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the
available cipher list.  Helps fix test_ssl with OpenSSL 1.0.0.
2010-04-17 17:10:38 +00:00
Antoine Pitrou
f9de534c21 Issue #8321: Give access to OpenSSL version numbers from the ssl module,
using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
and `ssl.OPENSSL_VERSION_NUMBER`.
2010-04-05 21:35:07 +00:00
Florent Xicluna
0762788081 #7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper. 2010-03-21 01:14:24 +00:00
Georg Brandl
a4f46e1292 Remove unused imports in test modules. 2010-02-07 17:03:15 +00:00
Georg Brandl
c7ca56d213 We heard you like test failures so we put unbound locals in your test so that you can fail while you fail. 2010-02-06 23:23:45 +00:00
Senthil Kumaran
ce8e33a095 Reverting the Revision: 77368. I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
2010-01-08 19:04:16 +00:00
Senthil Kumaran
3ddc435af6 Fixing - Issue7026 - RuntimeError: dictionary changed size during iteration. Patch by flox 2010-01-08 18:41:40 +00:00
Antoine Pitrou
5ba84910ae Issue #7133: SSL objects now support the new buffer API.
This fixes the test_ssl failure.
2009-10-19 17:59:07 +00:00
Benjamin Peterson
888a39b54c remove test_support.TestSkipped and just use unittest.SkipTest 2009-03-26 20:48:25 +00:00
Bill Janssen
eb257ac97d fix for release blocker 3910, 2.6 regression in socket.ssl method 2008-09-29 18:56:38 +00:00
Bill Janssen
61c001a939 incorporate fixes from issue 3162; SSL doc patch 2008-09-08 16:37:24 +00:00
Benjamin Peterson
26f521668a fix old API names in test_ssl 2008-08-18 18:39:57 +00:00
Bill Janssen
39295c2650 remove duplicate close() from ssl.py; expose unwrap and add test for it 2008-08-12 16:31:21 +00:00
Bill Janssen
0c1dbf8792 catch socket.error errors in badCertTest 2008-07-17 18:01:57 +00:00
Bill Janssen
de34d91eb0 make sure we close the active channels when eof is received on them 2008-06-28 23:00:39 +00:00
Bill Janssen
934b16d0c2 various SSL fixes; issues 1251, 3162, 3212 2008-06-28 22:19:33 +00:00