Blame SOURCES/mod_nss-makecheck.patch
|
 |
b7538d |
diff -up --recursive mod_nss-1.0.11/Makefile.am mod_nss-1.0.11.test/Makefile.am
|
|
|
b7538d |
--- mod_nss-1.0.11/Makefile.am 2015-09-21 16:41:05.789937357 -0400
|
|
|
b7538d |
+++ mod_nss-1.0.11.test/Makefile.am 2015-09-21 16:42:38.112473063 -0400
|
|
|
b7538d |
@@ -103,12 +103,6 @@ check:
|
|
|
b7538d |
cd test; \
|
|
|
b7538d |
rm -rf work; \
|
|
|
b7538d |
nosetests -v test_cipher.py; \
|
|
|
b7538d |
- ./setup.sh; \
|
|
|
b7538d |
- nosetests -v test.py; \
|
|
|
b7538d |
- sleep 5; \
|
|
|
b7538d |
- rm -rf work; \
|
|
|
b7538d |
- ./setup.sh sql:; \
|
|
|
b7538d |
- DBPREFIX=sql: nosetests -v test.py; \
|
|
|
b7538d |
cd ..
|
|
|
b7538d |
|
|
|
b7538d |
.PHONY: all test clean
|
|
|
b7538d |
diff -up --recursive mod_nss-1.0.11/test/test_request.py mod_nss-1.0.11.test/test/test_request.py
|
|
|
b7538d |
--- mod_nss-1.0.11/test/test_request.py 2014-12-02 13:59:03.000000000 -0500
|
|
|
b7538d |
+++ mod_nss-1.0.11.test/test/test_request.py 2015-09-21 16:42:25.563672095 -0400
|
|
|
b7538d |
@@ -4,8 +4,8 @@
|
|
|
b7538d |
import socket
|
|
|
b7538d |
import requests
|
|
|
b7538d |
import urlparse
|
|
|
b7538d |
-from urllib3.util import get_host
|
|
|
b7538d |
-from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
|
|
|
b7538d |
+from requests.packages.urllib3.util import get_host
|
|
|
b7538d |
+from requests.packages.urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
|
|
|
b7538d |
import logging
|
|
|
b7538d |
|
|
|
b7538d |
# Don't bend over backwards for ssl support, assume it is there.
|
|
|
b7538d |
@@ -107,6 +107,9 @@ class MyVerifiedHTTPSConnection(HTTPSCon
|
|
|
b7538d |
ca_certs = None
|
|
|
b7538d |
client_cipher = None
|
|
|
b7538d |
|
|
|
b7538d |
+ # A gross oversimplification but we aren't testing this
|
|
|
b7538d |
+ is_verified = True
|
|
|
b7538d |
+
|
|
|
b7538d |
def set_cert(self, key_file=None, cert_file=None,
|
|
|
b7538d |
cert_reqs='CERT_NONE', ca_certs=None):
|
|
|
b7538d |
ssl_req_scheme = {
|