Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions segment/analytics/test/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,19 @@ def test_default_timeout_15(self):
self.assertEqual(consumer.timeout, 15)

def test_proxies(self):
client = Client('testsecret', proxies={'http':'203.243.63.16:80','https':'203.243.63.16:80'})
success, msg = client.identify('userId', {'trait': 'value'})
self.assertTrue(success)
proxies={'http':'203.243.63.16:80','https':'203.243.63.16:80'}
client = Client('testsecret', proxies=proxies)
def mock_post_fn(*args, **kwargs):
res = mock.Mock()
res.status_code = 200
res.json.return_value = {'code': 'success', 'message': 'success'}
return res

with mock.patch('segment.analytics.request._session.post', side_effect=mock_post_fn) as mock_post:
success, msg = client.identify('userId', {'trait': 'value'})
client.flush()
self.assertTrue(success)
mock_post.assert_called_once()
args, kwargs = mock_post.call_args
self.assertIn('proxies', kwargs)
self.assertEqual(kwargs['proxies'], proxies)
17 changes: 15 additions & 2 deletions segment/analytics/test/test_consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,23 @@ def mock_post_fn(_, data, **kwargs):

@classmethod
def test_proxies(cls):
consumer = Consumer(None, 'testsecret', proxies={'http':'203.243.63.16:80','https':'203.243.63.16:80'})
proxies = {'http': '203.243.63.16:80', 'https': '203.243.63.16:80'}
consumer = Consumer(None, 'testsecret', proxies=proxies)
track = {
'type': 'track',
'event': 'python event',
'userId': 'userId'
}
consumer.request([track])

def mock_post_fn(*args, **kwargs):
res = mock.Mock()
res.status_code = 200
res.json.return_value = {'code': 'success', 'message': 'success'}
return res

with mock.patch('segment.analytics.request._session.post', side_effect=mock_post_fn) as mock_post:
consumer.request([track])
mock_post.assert_called_once()
args, kwargs = mock_post.call_args
cls().assertIn('proxies', kwargs)
cls().assertEqual(kwargs['proxies'], proxies)
26 changes: 19 additions & 7 deletions segment/analytics/test/test_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import unittest
import json
import requests
from unittest import mock

from segment.analytics.request import post, DatetimeSerializer

Expand Down Expand Up @@ -53,10 +54,21 @@ def test_should_timeout(self):
}], timeout=0.0001)

def test_proxies(self):
res = post('testsecret', batch=[{
'userId': 'userId',
'event': 'python event',
'type': 'track',
'proxies': {'http':'203.243.63.16:80','https':'203.243.63.16:80'}
}])
self.assertEqual(res.status_code, 200)
proxies = {'http': '203.243.63.16:80', 'https': '203.243.63.16:80'}
def mock_post_fn(*args, **kwargs):
res = mock.Mock()
res.status_code = 200
res.json.return_value = {'code': 'success', 'message': 'success'}
return res

with mock.patch('segment.analytics.request._session.post', side_effect=mock_post_fn) as mock_post:
res = post('testsecret', proxies= proxies, batch=[{
'userId': 'userId',
'event': 'python event',
'type': 'track'
}])
self.assertEqual(res.status_code, 200)
mock_post.assert_called_once()
args, kwargs = mock_post.call_args
self.assertIn('proxies', kwargs)
self.assertEqual(kwargs['proxies'], proxies)