10000 Merge branch 'master' of https://github.com/twilio/twilio-python into… · zhangjingcat/twilio-python@4f1f67e · GitHub
[go: up one dir, main page]
Skip to content

Commit 4f1f67e

Browse files
jingmingjingming
committed
Merge branch 'master' of https://github.com/twilio/twilio-python into edge
2 parents 4ae57f8 + bae3081 commit 4f1f67e

20 files changed

+423
-198
lines changed

‎.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ python:
55
- '3.2'
66
- '3.3'
77
- '3.4'
8+
- '3.5'
89
install:
9-
- pip install . --use-mirrors
10-
- pip install -r requirements.txt --use-mirrors
11-
- pip install -r tests/requirements.txt --use-mirrors
10+
- pip install .
11+
- pip install -r requirements.txt
12+
- pip install -r tests/requirements.txt
1213
script:
1314
- flake8 --ignore=F401 twilio
1415
- flake8 --ignore=E123,E126,E128,E501 tests

‎CHANGES.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ Released November 25, 2015:
4040

4141
- Adds support for python 3.5.
4242

43+
Version 4.9.2
44+
-------------
45+
46+
Released November 25, 2015:
47+
48+
- Fix for SIP Trunking bug
49+
4350
Version 5.0.1-edge
4451
-------------
4552

@@ -71,6 +78,7 @@ Released November 3, 2015:
7178
Version 4.8.0
7279
-------------
7380

81+
<<<<<<< HEAD
7482
Released November 2, 2015:
7583

7684
- Add SMS pricing endpoint
@@ -80,6 +88,14 @@ Version 4.6.0-edge
8088

8189
Released October 28, 2015:
8290

91+
=======
92+
- Add support for SMS pricing
93+
94+
95+
Version 4.6.0
96+
-------------
97+
98+
>>>>>>> bae308162e9e9505a73651d1de0a946e59c30267
8399
- Add /Keys endpoint
84100

85101
Version 4.6.0

‎tests/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
sphinx
2-
httplib2==0.8
32
mock==0.8.0
43
nose
54
coverage

‎tests/task_router/test_capability.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,36 @@ def test_defaults(self):
5959
)
6060
expected = [
6161
{
62-
'url': 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
62+
'url': websocket_url,
6363
'method': 'GET',
6464
'allow': True,
6565
'query_filter': {},
6666
'post_filter': {},
6767
},
6868
{
69-
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**'.format(self.workspace_sid),
69+
'url': websocket_url,
70+
'method': 'POST',
71+
'allow': True,
72+
'query_filter': {},
73+
'post_filter': {},
74+
},
75+
{
76+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
7077
'method': 'GET',
7178
'allow': True,
7279
'query_filter': {},
7380
'post_filter': {},
7481
},
7582
{
76-
'url': websocket_url,
83+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**'.format(self.workspace_sid),
7784
'method': 'GET',
7885
'allow': True,
7986
'query_filter': {},
8087
'post_filter': {},
8188
},
8289
{
83-
'url': websocket_url,
84-
'method': 'POST',
90+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}/Reservations/**'.format(self.workspace_sid, self.worker_sid),
91+
'method': 'GET',
8592
'allow': True,
8693
'query_filter': {},
8794
'post_filter': {},

‎tests/task_router/test_task_router_capability.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,15 @@ def test_worker_default(self):
7272
self.check_decoded(decoded, account_sid, workspace_sid, worker_sid, worker_sid)
7373

7474
policies = decoded['policies']
75-
self.assertEqual(len(policies), 5)
75+
self.assertEqual(len(policies), 6)
7676

7777
for method, url, policy in [
78-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[0]),
79-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[1]),
80-
('GET', "https://taskrouter.twilio.com/v1/wschannels/AC123/WK789", policies[2]),
81-
('POST', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[3]),
82-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", policies[4])
78+
('GET', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[0]),
79+
('POST', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[1]),
80+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", policies[2])
81+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[3]),
82+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[4]),
83+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**", policies[5])
8384
]:
8485
yield self.check_policy, method, url, policy
8586

@@ -128,15 +129,16 @@ def test_deprecated_worker(self):
128129
self.check_decoded(decoded, account_sid, workspace_sid, worker_sid, worker_sid)
129130

130131
policies = decoded['policies']
131-
self.assertEqual(len(policies), 5)
132+
self.assertEqual(len(policies), 6)
132133

133-
# should expect 5 policies
134+
# should expect 6 policies
134135
for method, url, policy in [
135-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[0]),
136-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[1]),
137-
('GET', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[2]),
138-
('POST', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[3]),
139-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", policies[4])
136+
('GET', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[0]),
137+
('POST', "https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", policies[1]),
138+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[2]),
139+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[3]),
140+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**", policies[4]),
141+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", policies[5])
140142
]:
141143
yield self.check_policy, method, url, policy
142144

‎tests/task_router/test_task_router_worker_capability.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,18 @@ def test_defaults(self):
7272

7373
websocket_url = 'https://event-bridge.twilio.com/v1/wschannels/{0}/{1}'.format(self.account_sid, self.worker_sid)
7474

75-
# expect 5 policies
75+
# expect 6 policies
7676
policies = decoded['policies']
77-
self.assertEqual(len(policies), 5)
77+
self.assertEqual(len(policies), 6)
7878

79-
# should expect 5 policies
79+
# should expect 6 policies
8080
for method, url, policy in [
8181
('GET', websocket_url, policies[0]),
8282
('POST', websocket_url, policies[1]),
8383
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", policies[2]),
84-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[3]),
85-
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[4])
84+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", policies[3])
85+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", policies[4]),
86+
('GET', "https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**", policies[5])
8687
]:
8788
yield self.check_policy, method, url, policy
8889

@@ -98,8 +99,8 @@ def test_allow_activity_updates(self):
9899
self.assertNotEqual(None, decoded)
99100

100101
policies = decoded['policies']
101-
self.assertEqual(len(policies), 6)
102-
policy = policies[5]
102+
self.assertEqual(len(policies), 7)
103+
policy = policies[6]
103104

104105
url = "https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}".format(self.workspace_sid, self.worker_sid)
105106

@@ -121,13 +122,15 @@ def test_allow_reservation_updates(self):
121122
self.assertNotEqual(None, decoded)
122123

123124
policies = decoded['policies']
124-
self.assertEqual(len(policies), 6)
125-
126-
policy = policies[5]
125+
self.assertEqual(len(policies), 8)
127126

128-
url = "https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**".format(self.workspace_sid)
127+
taskPolicy = policies[6]
128+
tasksUrl = "https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**".format(self.workspace_sid)
129+
self.check_policy('POST', tasksUrl, taskPolicy)
129130

130-
self.check_policy('POST', url, policy)
131+
workerReservationsPolicy = policies[7]
132+
reservationsUrl = "https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}/Reservations/**".format(self.workspace_sid, self.worker_sid)
133+
self.check_policy('POST', reservationsUrl, workerReservationsPolicy)
131134

132135
if __name__ == "__main__":
133136
unittest.main()

0 commit comments

Comments
 (0)
0