only use NTLM proxy after trying non-NTLM proxy
This commit is contained in:
Alan Hamlett
parent
004365efa7
commit
ccf5e39f44
4 changed files with 199 additions and 56 deletions
|
|
@ -91,6 +91,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
def test_400_response(self):
|
||||
response = Response()
|
||||
response.status_code = 400
|
||||
|
|
@ -118,6 +122,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
def test_401_response(self):
|
||||
response = Response()
|
||||
response.status_code = 401
|
||||
|
|
@ -164,6 +172,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
@log_capture()
|
||||
def test_500_response_without_offline_logging(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
|
@ -207,6 +219,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
@log_capture()
|
||||
def test_requests_exception(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
|
@ -264,6 +280,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
@log_capture()
|
||||
def test_requests_exception_without_offline_logging(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
|
@ -298,6 +318,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
@log_capture()
|
||||
def test_invalid_api_key(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
|
@ -328,6 +352,8 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_not_called()
|
||||
|
||||
def test_nonascii_hostname(self):
|
||||
response = Response()
|
||||
response.status_code = 201
|
||||
|
|
@ -428,6 +454,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
|
||||
|
||||
headers = self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].call_args[0][0].headers
|
||||
expected_tz = u(bytes('\xab', 'utf-16') if is_py3 else '\xab').encode('utf-8')
|
||||
self.assertEquals(headers.get('TimeZone'), expected_tz)
|
||||
|
||||
def test_tzlocal_exception(self):
|
||||
response = Response()
|
||||
response.status_code = 201
|
||||
|
|
@ -537,6 +567,10 @@ class MainTestCase(utils.TestCase):
|
|||
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
||||
@log_capture()
|
||||
def test_unhandled_exception(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
|
@ -563,6 +597,8 @@ class MainTestCase(utils.TestCase):
|
|||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
self.patched['wakatime.session_cache.SessionCache.get'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_not_called()
|
||||
|
||||
def test_large_file_skips_lines_count(self):
|
||||
response = Response()
|
||||
response.status_code = 0
|
||||
|
|
@ -611,3 +647,7 @@ class MainTestCase(utils.TestCase):
|
|||
self.assertEquals(heartbeat[key], val)
|
||||
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(
|
||||
ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -18,10 +18,6 @@ from wakatime.constants import (
|
|||
)
|
||||
from wakatime.packages.requests.models import Response
|
||||
from . import utils
|
||||
try:
|
||||
from mock import call
|
||||
except ImportError:
|
||||
from unittest.mock import call
|
||||
try:
|
||||
from .packages import simplejson as json
|
||||
except (ImportError, SyntaxError):
|
||||
|
|
@ -393,5 +389,5 @@ class OfflineQueueTestCase(utils.TestCase):
|
|||
self.assertIn(exception_msg, output[0])
|
||||
|
||||
self.patched['wakatime.session_cache.SessionCache.get'].assert_called_once_with()
|
||||
self.patched['wakatime.session_cache.SessionCache.delete'].assert_has_calls([call(), call()])
|
||||
self.patched['wakatime.session_cache.SessionCache.delete'].assert_called_once_with()
|
||||
self.patched['wakatime.session_cache.SessionCache.save'].assert_not_called()
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ import shutil
|
|||
import sys
|
||||
from testfixtures import log_capture
|
||||
from wakatime.compat import u
|
||||
from wakatime.constants import SUCCESS
|
||||
from wakatime.constants import API_ERROR, SUCCESS
|
||||
from wakatime.packages.requests.models import Response
|
||||
from . import utils
|
||||
|
||||
try:
|
||||
from mock import ANY
|
||||
from mock import ANY, call
|
||||
except ImportError:
|
||||
from unittest.mock import ANY
|
||||
from unittest.mock import ANY, call
|
||||
|
||||
|
||||
class ProxyTestCase(utils.TestCase):
|
||||
|
|
@ -113,9 +113,9 @@ class ProxyTestCase(utils.TestCase):
|
|||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True)
|
||||
|
||||
def test_ntlm_proxy(self):
|
||||
def test_ntlm_proxy_used_after_trying_normal_proxy(self):
|
||||
response = Response()
|
||||
response.status_code = 201
|
||||
response.status_code = 400
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
|
||||
|
||||
with utils.TemporaryDirectory() as tempdir:
|
||||
|
|
@ -127,18 +127,60 @@ class ProxyTestCase(utils.TestCase):
|
|||
args = ['--file', entity, '--config', config, '--proxy', proxy]
|
||||
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, SUCCESS)
|
||||
self.assertEquals(retval, API_ERROR)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
||||
self.patched['wakatime.session_cache.SessionCache.get'].assert_called_once_with()
|
||||
self.patched['wakatime.session_cache.SessionCache.delete'].assert_not_called()
|
||||
self.patched['wakatime.session_cache.SessionCache.save'].assert_called_once_with(ANY)
|
||||
self.patched['wakatime.session_cache.SessionCache.get'].assert_has_calls([call(), call()])
|
||||
self.patched['wakatime.session_cache.SessionCache.delete'].assert_called_once_with()
|
||||
self.patched['wakatime.session_cache.SessionCache.save'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_called_once_with()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_called_once_with(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True)
|
||||
expected_calls = [
|
||||
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True),
|
||||
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True),
|
||||
]
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_has_calls(expected_calls)
|
||||
|
||||
@log_capture()
|
||||
def test_ntlm_proxy_used_after_normal_proxy_raises_exception(self, logs):
|
||||
logging.disable(logging.NOTSET)
|
||||
|
||||
ex_msg = 'after exception, should still try ntlm proxy'
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].side_effect = RuntimeError(ex_msg)
|
||||
|
||||
with utils.TemporaryDirectory() as tempdir:
|
||||
|
||||
entity = 'tests/samples/codefiles/emptyfile.txt'
|
||||
shutil.copy(entity, os.path.join(tempdir, 'emptyfile.txt'))
|
||||
entity = os.path.realpath(os.path.join(tempdir, 'emptyfile.txt'))
|
||||
proxy = 'domain\\user:pass'
|
||||
config = 'tests/samples/configs/good_config.cfg'
|
||||
args = ['--file', entity, '--config', config, '--proxy', proxy]
|
||||
|
||||
retval = execute(args)
|
||||
|
||||
self.assertEquals(retval, API_ERROR)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
||||
log_output = u("\n").join([u(' ').join(x) for x in logs.actual()])
|
||||
self.assertIn(ex_msg, log_output)
|
||||
|
||||
self.patched['wakatime.session_cache.SessionCache.get'].assert_has_calls([call(), call()])
|
||||
self.patched['wakatime.session_cache.SessionCache.delete'].assert_called_once_with()
|
||||
self.patched['wakatime.session_cache.SessionCache.save'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
expected_calls = [
|
||||
call(ANY, cert=None, proxies={'https': proxy}, stream=False, timeout=60, verify=True),
|
||||
call(ANY, cert=None, proxies={}, stream=False, timeout=60, verify=True),
|
||||
]
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_has_calls(expected_calls)
|
||||
|
||||
@log_capture()
|
||||
def test_invalid_proxy(self, logs):
|
||||
|
|
@ -174,3 +216,5 @@ class ProxyTestCase(utils.TestCase):
|
|||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_not_called()
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
||||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].assert_not_called()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue