File tree Expand file tree Collapse file tree 2 files changed +3
-26
lines changed Expand file tree Collapse file tree 2 files changed +3
-26
lines changed Original file line number Diff line number Diff line change @@ -107,6 +107,8 @@ if [ -n "$TEST_ENCRYPTION" ]; then
107
107
108
108
if [ " Windows_NT" = " $OS " ]; then # Magic variable in cygwin
109
109
$PYTHON -m pip install -U setuptools
110
+ # PYTHON-2808 Ensure this machine has the CA cert for google KMS.
111
+ powershell.exe " Invoke-WebRequest -URI https://oauth2.googleapis.com/" > /dev/null || true
110
112
fi
111
113
112
114
if [ -z " $LIBMONGOCRYPT_URL " ]; then
@@ -149,10 +151,6 @@ if [ -n "$TEST_ENCRYPTION" ]; then
149
151
. $DRIVERS_TOOLS /.evergreen/csfle/set-temp-creds.sh
150
152
151
153
# Start the mock KMS servers.
152
- if [ " $OS " = " Windows_NT" ]; then
153
- # Remove after BUILD-13574.
154
- python -m pip install certifi
155
- fi
156
154
pushd ${DRIVERS_TOOLS} /.evergreen/csfle
157
155
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
158
156
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
Original file line number Diff line number Diff line change 55
55
from test import (unittest ,
56
56
client_context ,
57
57
IntegrationTest ,
58
- PyMongoTestCase ,
59
- SystemCertsPatcher )
58
+ PyMongoTestCase )
60
59
from test .utils import (TestCreator ,
61
60
camel_to_snake_args ,
62
61
OvertCommandListener ,
66
65
wait_until )
67
66
from test .utils_spec_runner import SpecRunner
68
67
69
- try :
70
- import certifi
71
- HAVE_CERTIFI = True
72
- except ImportError :
73
- HAVE_CERTIFI = False
74
-
75
- patcher = None
76
-
77
-
78
- def setUpModule ():
79
- if sys .platform == 'win32' and HAVE_CERTIFI :
80
- # Remove after BUILD-13574.
81
- global patcher
82
- patcher = SystemCertsPatcher (certifi .where ())
83
-
84
-
85
- def tearDownModule ():
86
- if patcher :
87
- patcher .disable ()
88
-
89
68
90
69
def get_client_opts (client ):
91
70
return client ._MongoClient__options
You can’t perform that action at this time.
0 commit comments