Fix missed tests and revert conftest change (breaks docker build)

oauth/test/test_oidc.py

@@ -6,6 +6,7 @@ import urlparse
 
 import jwt
 import pytest
+import requests
 
 from httmock import urlmatch, HTTMock
 from Crypto.PublicKey import RSA
@@ -13,6 +14,15 @@ from jwkest.jwk import RSAKey
 
 from oauth.oidc import OIDCLoginService, OAuthLoginException
 
+@pytest.fixture()
+def http_client():
+  sess = requests.Session()
+  adapter = requests.adapters.HTTPAdapter(pool_connections=100,
+                                          pool_maxsize=100)
+  sess.mount('http://', adapter)
+  sess.mount('https://', adapter)
+  return sess
+
 @pytest.fixture(params=[True, False])
 def app_config(http_client, request):
   return {