aboutsummaryrefslogtreecommitdiff
path: root/test/with_dummyserver
diff options
context:
space:
mode:
Diffstat (limited to 'test/with_dummyserver')
-rw-r--r--test/with_dummyserver/__init__.pycbin151 -> 0 bytes
-rw-r--r--test/with_dummyserver/test_connectionpool.py12
-rw-r--r--test/with_dummyserver/test_connectionpool.pycbin27640 -> 0 bytes
-rw-r--r--test/with_dummyserver/test_https.py36
-rw-r--r--test/with_dummyserver/test_https.pycbin15651 -> 0 bytes
-rw-r--r--test/with_dummyserver/test_poolmanager.pycbin5591 -> 0 bytes
-rw-r--r--test/with_dummyserver/test_proxy_poolmanager.py28
-rw-r--r--test/with_dummyserver/test_proxy_poolmanager.pycbin9891 -> 0 bytes
-rw-r--r--test/with_dummyserver/test_socketlevel.py18
-rw-r--r--test/with_dummyserver/test_socketlevel.pycbin18715 -> 0 bytes
10 files changed, 84 insertions, 10 deletions
diff --git a/test/with_dummyserver/__init__.pyc b/test/with_dummyserver/__init__.pyc
deleted file mode 100644
index 833be60..0000000
--- a/test/with_dummyserver/__init__.pyc
+++ /dev/null
Binary files differ
diff --git a/test/with_dummyserver/test_connectionpool.py b/test/with_dummyserver/test_connectionpool.py
index 7d54fbf..cc0f011 100644
--- a/test/with_dummyserver/test_connectionpool.py
+++ b/test/with_dummyserver/test_connectionpool.py
@@ -13,8 +13,7 @@ except:
from urllib import urlencode
from .. import (
- requires_network,
- onlyPy3, onlyPy27OrNewer, onlyPy26OrOlder,
+ requires_network, onlyPy3, onlyPy26OrOlder,
TARPIT_HOST, VALID_SOURCE_ADDRESSES, INVALID_SOURCE_ADDRESSES,
)
from ..port_helpers import find_unused_port
@@ -99,6 +98,13 @@ class TestConnectionPool(HTTPDummyServerTestCase):
r = self.pool.request('POST', '/echo', fields=fields)
self.assertEqual(r.data.count(b'name="foo"'), 2)
+ def test_request_method_body(self):
+ body = b'hi'
+ r = self.pool.request('POST', '/echo', body=body)
+ self.assertEqual(r.data, body)
+
+ fields = [('hi', 'hello')]
+ self.assertRaises(TypeError, self.pool.request, 'POST', '/echo', body=body, fields=fields)
def test_unicode_upload(self):
fieldname = u('myfile')
@@ -189,7 +195,7 @@ class TestConnectionPool(HTTPDummyServerTestCase):
@timed(0.5)
def test_timeout(self):
""" Requests should time out when expected """
- url = '/sleep?seconds=0.002'
+ url = '/sleep?seconds=0.003'
timeout = Timeout(read=0.001)
# Pool-global timeout
diff --git a/test/with_dummyserver/test_connectionpool.pyc b/test/with_dummyserver/test_connectionpool.pyc
deleted file mode 100644
index b8c38e9..0000000
--- a/test/with_dummyserver/test_connectionpool.pyc
+++ /dev/null
Binary files differ
diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
index cf3eee7..16ca589 100644
--- a/test/with_dummyserver/test_https.py
+++ b/test/with_dummyserver/test_https.py
@@ -9,7 +9,8 @@ import mock
from nose.plugins.skip import SkipTest
from dummyserver.testcase import HTTPSDummyServerTestCase
-from dummyserver.server import DEFAULT_CA, DEFAULT_CA_BAD, DEFAULT_CERTS
+from dummyserver.server import (DEFAULT_CA, DEFAULT_CA_BAD, DEFAULT_CERTS,
+ NO_SAN_CERTS, NO_SAN_CA)
from test import (
onlyPy26OrOlder,
@@ -168,7 +169,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
https_pool.request('HEAD', '/')
def test_assert_hostname_false(self):
- https_pool = HTTPSConnectionPool('127.0.0.1', self.port,
+ https_pool = HTTPSConnectionPool('localhost', self.port,
cert_reqs='CERT_REQUIRED',
ca_certs=DEFAULT_CA)
@@ -176,7 +177,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
https_pool.request('GET', '/')
def test_assert_specific_hostname(self):
- https_pool = HTTPSConnectionPool('127.0.0.1', self.port,
+ https_pool = HTTPSConnectionPool('localhost', self.port,
cert_reqs='CERT_REQUIRED',
ca_certs=DEFAULT_CA)
@@ -184,7 +185,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
https_pool.request('GET', '/')
def test_assert_fingerprint_md5(self):
- https_pool = HTTPSConnectionPool('127.0.0.1', self.port,
+ https_pool = HTTPSConnectionPool('localhost', self.port,
cert_reqs='CERT_REQUIRED',
ca_certs=DEFAULT_CA)
@@ -193,7 +194,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
https_pool.request('GET', '/')
def test_assert_fingerprint_sha1(self):
- https_pool = HTTPSConnectionPool('127.0.0.1', self.port,
+ https_pool = HTTPSConnectionPool('localhost', self.port,
cert_reqs='CERT_REQUIRED',
ca_certs=DEFAULT_CA)
@@ -329,6 +330,8 @@ class TestHTTPS(HTTPSDummyServerTestCase):
https_pool._make_request(conn, 'GET', '/')
def test_ssl_correct_system_time(self):
+ self._pool.cert_reqs = 'CERT_REQUIRED'
+ self._pool.ca_certs = DEFAULT_CA
with warnings.catch_warnings(record=True) as w:
warnings.simplefilter('always')
self._pool.request('GET', '/')
@@ -336,6 +339,8 @@ class TestHTTPS(HTTPSDummyServerTestCase):
self.assertEqual([], w)
def test_ssl_wrong_system_time(self):
+ self._pool.cert_reqs = 'CERT_REQUIRED'
+ self._pool.ca_certs = DEFAULT_CA
with mock.patch('urllib3.connection.datetime') as mock_date:
mock_date.date.today.return_value = datetime.date(1970, 1, 1)
@@ -369,6 +374,27 @@ class TestHTTPS_TLSv1(HTTPSDummyServerTestCase):
self._pool.ssl_version = 'SSLv3'
self.assertRaises(SSLError, self._pool.request, 'GET', '/')
+ def test_discards_connection_on_sslerror(self):
+ self._pool.cert_reqs = 'CERT_REQUIRED'
+ self.assertRaises(SSLError, self._pool.request, 'GET', '/')
+ self._pool.ca_certs = DEFAULT_CA
+ self._pool.request('GET', '/')
+
+
+class TestHTTPS_NoSAN(HTTPSDummyServerTestCase):
+ certs = NO_SAN_CERTS
+
+ def test_warning_for_certs_without_a_san(self):
+ """Ensure that a warning is raised when the cert from the server has
+ no Subject Alternative Name."""
+ with mock.patch('warnings.warn') as warn:
+ https_pool = HTTPSConnectionPool(self.host, self.port,
+ cert_reqs='CERT_REQUIRED',
+ ca_certs=NO_SAN_CA)
+ r = https_pool.request('GET', '/')
+ self.assertEqual(r.status, 200)
+ self.assertTrue(warn.called)
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/with_dummyserver/test_https.pyc b/test/with_dummyserver/test_https.pyc
deleted file mode 100644
index 6d85316..0000000
--- a/test/with_dummyserver/test_https.pyc
+++ /dev/null
Binary files differ
diff --git a/test/with_dummyserver/test_poolmanager.pyc b/test/with_dummyserver/test_poolmanager.pyc
deleted file mode 100644
index 26c52e9..0000000
--- a/test/with_dummyserver/test_poolmanager.pyc
+++ /dev/null
Binary files differ
diff --git a/test/with_dummyserver/test_proxy_poolmanager.py b/test/with_dummyserver/test_proxy_poolmanager.py
index 61eedf1..df300fe 100644
--- a/test/with_dummyserver/test_proxy_poolmanager.py
+++ b/test/with_dummyserver/test_proxy_poolmanager.py
@@ -1,13 +1,17 @@
-import unittest
import json
import socket
+import unittest
+
+from nose.tools import timed
from dummyserver.testcase import HTTPDummyProxyTestCase
from dummyserver.server import (
DEFAULT_CA, DEFAULT_CA_BAD, get_unreachable_address)
+from .. import TARPIT_HOST
from urllib3.poolmanager import proxy_from_url, ProxyManager
-from urllib3.exceptions import MaxRetryError, SSLError, ProxyError
+from urllib3.exceptions import (
+ MaxRetryError, SSLError, ProxyError, ConnectTimeoutError)
from urllib3.connectionpool import connection_from_url, VerifiedHTTPSConnection
@@ -259,5 +263,25 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase):
self.assertEqual(sc3,sc4)
+ @timed(0.5)
+ def test_https_proxy_timeout(self):
+ https = proxy_from_url('https://{host}'.format(host=TARPIT_HOST))
+ try:
+ https.request('GET', self.http_url, timeout=0.001)
+ self.fail("Failed to raise retry error.")
+ except MaxRetryError as e:
+ assert isinstance(e.reason, ConnectTimeoutError)
+
+
+ @timed(0.5)
+ def test_https_proxy_pool_timeout(self):
+ https = proxy_from_url('https://{host}'.format(host=TARPIT_HOST),
+ timeout=0.001)
+ try:
+ https.request('GET', self.http_url)
+ self.fail("Failed to raise retry error.")
+ except MaxRetryError as e:
+ assert isinstance(e.reason, ConnectTimeoutError)
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/with_dummyserver/test_proxy_poolmanager.pyc b/test/with_dummyserver/test_proxy_poolmanager.pyc
deleted file mode 100644
index 12c320c..0000000
--- a/test/with_dummyserver/test_proxy_poolmanager.pyc
+++ /dev/null
Binary files differ
diff --git a/test/with_dummyserver/test_socketlevel.py b/test/with_dummyserver/test_socketlevel.py
index e1ac1c6..c1ef1be 100644
--- a/test/with_dummyserver/test_socketlevel.py
+++ b/test/with_dummyserver/test_socketlevel.py
@@ -137,6 +137,24 @@ class TestSocketClosing(SocketDummyServerTestCase):
finally:
timed_out.set()
+ def test_https_connection_read_timeout(self):
+ """ Handshake timeouts should fail with a Timeout"""
+ timed_out = Event()
+ def socket_handler(listener):
+ sock = listener.accept()[0]
+ while not sock.recv(65536):
+ pass
+
+ timed_out.wait()
+ sock.close()
+
+ self._start_server(socket_handler)
+ pool = HTTPSConnectionPool(self.host, self.port, timeout=0.001, retries=False)
+ try:
+ self.assertRaises(ReadTimeoutError, pool.request, 'GET', '/')
+ finally:
+ timed_out.set()
+
def test_timeout_errors_cause_retries(self):
def socket_handler(listener):
sock_timeout = listener.accept()[0]
diff --git a/test/with_dummyserver/test_socketlevel.pyc b/test/with_dummyserver/test_socketlevel.pyc
deleted file mode 100644
index ba3b19e..0000000
--- a/test/with_dummyserver/test_socketlevel.pyc
+++ /dev/null
Binary files differ