Skip to content
This repository was archived by the owner on Oct 9, 2021. It is now read-only.

Commit 84dfa98

Browse files
alanhamlettalanhamlett
committed
Use new verify default in test mocks
1 parent 7c8afdb commit 84dfa98

3 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎tests/test_arguments.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
AUTH_ERROR,
1919
SUCCESS,
2020
)
21+
from wakatime.packages import certifi
2122
from wakatime.packages.requests.exceptions import RequestException
2223
from wakatime.packages.requests.models import Response
2324
from wakatime.utils import get_user_agent
@@ -436,7 +437,7 @@ def test_proxy_argument(self, logs):
436437
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
437438
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
438439

439-
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True)
440+
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where())
440441

441442
@log_capture()
442443
def test_disable_ssl_verify_argument(self, logs):
@@ -1338,7 +1339,8 @@ def test_requests_exception_with_today_arg(self, logs):
13381339
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].side_effect = RequestException('requests exception')
13391340

13401341
key = str(uuid.uuid4())
1341-
args = ['--today', '--key', key]
1342+
config = 'tests/samples/configs/good_config.cfg'
1343+
args = ['--today', '--config', config, '--key', key]
13421344

13431345
retval = execute(args)
13441346
self.assertEquals(retval, API_ERROR)
@@ -1379,7 +1381,8 @@ def test_generic_exception_with_today_arg(self, logs):
13791381
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].side_effect = Exception('generic exception')
13801382

13811383
key = str(uuid.uuid4())
1382-
args = ['--today', '--key', key]
1384+
config = 'tests/samples/configs/good_config.cfg'
1385+
args = ['--today', '--config', config, '--key', key]
13831386

13841387
retval = execute(args)
13851388
self.assertEquals(retval, API_ERROR)
@@ -1423,7 +1426,8 @@ def test_error_response_with_today_arg(self, logs):
14231426
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
14241427

14251428
key = str(uuid.uuid4())
1426-
args = ['--today', '--key', key]
1429+
config = 'tests/samples/configs/good_config.cfg'
1430+
args = ['--today', '--config', config, '--key', key]
14271431

14281432
retval = execute(args)
14291433
self.assertEquals(retval, API_ERROR)

‎tests/test_proxy.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from testfixtures import log_capture
1212
from wakatime.compat import u
1313
from wakatime.constants import API_ERROR, SUCCESS
14+
from wakatime.packages import certifi
1415
from wakatime.packages.requests.exceptions import RequestException
1516
from wakatime.packages.requests.models import Response
1617
from . import utils
@@ -58,7 +59,7 @@ def test_proxy_without_protocol(self):
5859
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
5960
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
6061

61-
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True)
62+
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where())
6263

6364
def test_https_proxy(self):
6465
response = CustomResponse()
@@ -84,7 +85,7 @@ def test_https_proxy(self):
8485
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
8586
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
8687

87-
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True)
88+
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where())
8889

8990
def test_socks_proxy(self):
9091
response = CustomResponse()
@@ -110,7 +111,7 @@ def test_socks_proxy(self):
110111
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
111112
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
112113

113-
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True)
114+
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where())
114115

115116
def test_ntlm_proxy_used_after_trying_normal_proxy(self):
116117
response = Response()
@@ -138,8 +139,8 @@ def test_ntlm_proxy_used_after_trying_normal_proxy(self):
138139
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
139140

140141
expected_calls = [
141-
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True),
142-
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True),
142+
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where()),
143+
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=certifi.where()),
143144
]
144145
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_has_calls(expected_calls)
145146

@@ -176,8 +177,8 @@ def test_ntlm_proxy_used_after_normal_proxy_raises_exception(self, logs):
176177
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
177178

178179
expected_calls = [
179-
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True),
180-
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True),
180+
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where()),
181+
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=certifi.where()),
181182
]
182183
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_has_calls(expected_calls)
183184

@@ -214,8 +215,8 @@ def test_ntlm_proxy_used_after_normal_proxy_raises_requests_exception(self, logs
214215
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
215216

216217
expected_calls = [
217-
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True),
218-
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True),
218+
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=certifi.where()),
219+
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=certifi.where()),
219220
]
220221
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_has_calls(expected_calls)
221222

‎tests/utils.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import tempfile
99

1010
from wakatime.compat import u
11+
from wakatime.packages import certifi
1112
from wakatime.packages.requests.models import Response
1213
from wakatime.utils import BACKSLASH_REPLACE_PATTERN, WINDOWS_DRIVE_PATTERN
1314

@@ -93,7 +94,7 @@ def assertPathsEqual(self, first_path, second_path, message=None):
9394
def assertHeartbeatNotSent(self):
9495
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_not_called()
9596

96-
def assertHeartbeatSent(self, heartbeat=None, extra_heartbeats=[], headers=None, cert=None, proxies={}, stream=False, timeout=60, verify=True):
97+
def assertHeartbeatSent(self, heartbeat=None, extra_heartbeats=[], headers=None, cert=None, proxies={}, stream=False, timeout=60, verify=certifi.where()):
9798
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
9899
ANY, cert=cert, proxies=proxies, stream=stream, timeout=timeout, verify=verify,
99100
)

0 commit comments

Comments
 (0)