8000 Remove calls to assertIsNotNone · patrick91/twilio-python@7593d7f · GitHub
[go: up one dir, main page]
Skip to content

Commit 7593d7f

Browse files
author
Carlos Diaz-Padron
committed
Remove calls to assertIsNotNone
This call does not exist < 2.7
1 parent 8e553c4 commit 7593d7f

6 files changed

+52
-52
lines changed

‎tests/task_router/test_capability.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_defaults(self):
5555

5656
self.assertTrue(decoded is not None)
5757
websocket_url = (
58-
'https://event-bridge.twilio.com/v1/wschannels/{}/{}'.format(self.account_sid, self.worker_sid)
58+
'https://event-bridge.twilio.com/v1/wschannels/{0}/{1}'.format(self.account_sid, self.worker_sid)
5959
)
6060
expected = [
6161
{
@@ -66,7 +66,7 @@ def test_defaults(self):
6666
'post_filter': {},
6767
},
6868
{
69-
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{}/Tasks/**'.format(self.workspace_sid),
69+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**'.format(self.workspace_sid),
7070
'method': 'GET',
7171
'allow': True,
7272
'query_filter': {},
@@ -87,7 +87,7 @@ def test_defaults(self):
8787
'post_filter': {},
8888
},
8989
{
90-
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{}/Workers/{}'.format(self.workspace_sid, self.worker_sid),
90+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}'.format(self.workspace_sid, self.worker_sid),
9191
'method': 'GET',
9292
'allow': True,
9393
'query_filter': {},
@@ -102,7 +102,7 @@ def test_allow_worker_activity_updates(self):
102102
decoded = jwt.decode(token, self.auth_token)
103103

104104
self.assertTrue(decoded is not None)
105-
url = 'https://taskrouter.twilio.com/v1/Workspaces/{}/Workers/{}'.format(
105+
url = 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}'.format(
106106
self.workspace_sid,
107107
self.worker_sid,
108108
)
@@ -122,7 +122,7 @@ def test_allow_worker_fetch_attributes(self):
122122
decoded = jwt.decode(token, self.auth_token)
123123

124124
self.assertTrue(decoded is not None)
125-
url = 'https://taskrouter.twilio.com/v1/Workspaces/{}/Workers/{}'.format(
125+
url = 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Workers/{1}'.format(
126126
self.workspace_sid,
127127
self.worker_sid,
128128
)
@@ -143,7 +143,7 @@ def test_allow_task_reservation_updates(self):
143143
decoded = jwt.decode(token, self.auth_token)
144144

145145
self.assertTrue(decoded is not None)
146-
url = 'https://taskrouter.twilio.com/v1/Workspaces/{}/Tasks/**'.format(
146+
url = 'https://taskrouter.twilio.com/v1/Workspaces/{0}/Tasks/**'.format(
147147
self.workspace_sid,
148148
)
149149

‎tests/task_router/test_task_router_capability.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ def test_workspace_default(self):
3737
capability.generate_token()
3838

3939
token = capability.generate_token()
40-
self.assertIsNotNone(token)
40+
self.assertNotEqual(None, token)
4141

4242
decoded = jwt.decode(token, auth_token)
43-
self.assertIsNotNone(decoded)
43+
self.assertNotEqual(None, decoded)
4444

4545
self.check_decoded(decoded, account_sid, workspace_sid, channel_id)
4646

@@ -64,10 +64,10 @@ def test_worker_default(self):
6464
capability.generate_token()
6565

6666
token = capability.generate_token()
67-
self.assertIsNotNone(token)
67+
self.assertNotEqual(None, token)
6868

6969
decoded = jwt.decode(token, auth_token)
70-
self.assertIsNotNone(decoded)
70+
self.assertNotEqual(None, decoded)
7171

7272
self.check_decoded(decoded, account_sid, workspace_sid, worker_sid, worker_sid)
7373

@@ -93,10 +93,10 @@ def test_task_queue_default(self):
9393
capability.generate_token()
9494

9595
token = capability.generate_token()
96-
self.assertIsNotNone(token)
96+
self.assertNotEqual(None, token)
9797

9898
decoded = jwt.decode(token, auth_token)
99-
self.assertIsNotNone(decoded)
99+
self.assertNotEqual(None, decoded)
100100

101101
self.check_decoded(decoded, account_sid, workspace_sid, taskqueue_sid, taskqueue_sid)
102102

@@ -120,10 +120,10 @@ def test_deprecated_worker(self):
120120
capability.generate_token()
121121

122122
token = capability.generate_token()
123-
self.assertIsNotNone(token)
123+
self.assertNotEqual(None, token)
124124

125125
decoded = jwt.decode(token, auth_token)
126-
self.assertIsNotNone(decoded)
126+
self.assertNotEqual(None, decoded)
127127

128128
self.check_decoded(decoded, account_sid, workspace_sid, worker_sid, worker_sid)
129129

‎tests/task_router/test_task_router_taskqueue_capability.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def setUp(self):
1717
def test_generate_token(self):
1818

1919
token = self.capability.generate_token()
20-
self.assertIsNotNone(token)
20+
self.assertNotEqual(None, token)
2121

2222
decoded = jwt.decode(token, self.auth_token)
23-
self.assertIsNotNone(decoded)
23+
self.assertNotEqual(None, decoded)
2424

2525
self.assertEqual(decoded["iss"], self.account_sid)
2626
self.assertEqual(decoded["account_sid"], self.account_sid)
@@ -32,30 +32,30 @@ def test_generate_token(self):
3232

3333
def test_generate_token_with_default_ttl(self):
3434
token = self.capability.generate_token()
35-
self.assertIsNotNone(token)
35+
self.assertNotEqual(None, token)
3636

3737
decoded = jwt.decode(token, self.auth_token)
38-
self.assertIsNotNone(decoded)
38+
self.assertNotEqual(None, decoded)
3939

4040
self.assertEqual(int(time.time()) + 3600, decoded["exp"])
4141

4242
def test_generate_token_with_custom_ttl(self):
4343
ttl = 10000
4444

4545
token = self.capability.generate_token(ttl)
46-
self.assertIsNotNone(token)
46+
self.assertNotEqual(None, token)
4747

4848
decoded = jwt.decode(token, self.auth_token)
49-
self.assertIsNotNone(decoded)
49+
self.assertNotEqual(None, decoded)
5050

5151
self.assertEqual(int(time.time()) + 10000, decoded["exp"])
5252

5353
def test_default(self):
5454
token = self.capability.generate_token()
55-
self.assertIsNotNone(token)
55+
self.assertNotEqual(None, token)
5656

5757
decoded = jwt.decode(token, self.auth_token)
58-
self.assertIsNotNone(decoded)
58+
self.assertNotEqual(None, decoded)
5959

6060
policies = decoded['policies']
6161
self.assertEqual(len(policies), 3)
@@ -88,10 +88,10 @@ def test_allow_fetch_subresources(self):
8888
self.capability.allow_fetch_subresources()
8989

9090
token = self.capability.generate_token()
91-
self.assertIsNotNone(token)
91+
self.assertNotEqual(None, token)
9292

9393
decoded = jwt.decode(token, self.auth_token)
94-
self.assertIsNotNone(decoded)
94+
self.assertNotEqual(None, decoded)
9595

9696
policies = decoded['policies']
9797
self.assertEqual(len(policies), 4)
@@ -110,10 +110,10 @@ def test_allow_updates_subresources(self):
110110
self.capability.allow_updates_subresources()
111111

112112
token = self.capability.generate_token()
113-
self.assertIsNotNone(token)
113+
self.assertNotEqual(None, token)
114114

115115
decoded = jwt.decode(token, self.auth_token)
116-
self.assertIsNotNone(decoded)
116+
self.assertNotEqual(None, decoded)
117117

118118
policies = decoded['policies']
119119
self.assertEqual(len(policies), 4)

‎tests/task_router/test_task_router_worker_capability.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,39 @@ def setUp(self):
3636
def test_generate_token(self):
3737

3838
token = self.capability.generate_token()
39-
self.assertIsNotNone(token)
39+
self.assertNotEqual(None, token)
4040

4141
decoded = jwt.decode(token, self.auth_token)
42-
self.assertIsNotNone(decoded)
42+
self.assertNotEqual(None, decoded)
4343

4444
self.check_decoded(decoded, self.account_sid, self.workspace_sid, self.worker_sid, self.worker_sid)
4545

4646
def test_generate_token_with_default_ttl(self):
4747
token = self.capability.generate_token()
48-
self.assertIsNotNone(token)
48+
self.assertNotEqual(None, token)
4949

5050
decoded = jwt.decode(token, self.auth_token)
51-
self.assertIsNotNone(decoded)
51+
self.assertNotEqual(None, decoded)
5252

5353
self.assertEqual(int(time.time()) + 3600, decoded["exp"])
5454

5555
def test_generate_token_with_custom_ttl(self):
5656
ttl = 10000
5757

5858
token = self.capability.generate_token(ttl)
59-
self.assertIsNotNone(token)
59+
self.assertNotEqual(None, token)
6060

6161
decoded = jwt.decode(token, self.auth_token)
62-
self.assertIsNotNone(decoded)
62+
self.assertNotEqual(None, decoded)
6363

6464
self.assertEqual(int(time.time()) + 10000, decoded["exp"])
6565

6666
def test_defaults(self):
6767
token = self.capability.generate_token()
68-
self.assertIsNotNone(token)
68+
self.assertNotEqual(None, token)
6969

7070
decoded = jwt.decode(token, self.auth_token)
71-
self.assertIsNotNone(decoded)
71+
self.assertNotEqual(None, decoded)
7272

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

@@ -92,10 +92,10 @@ def test_allow_activity_updates(self):
9292
self.capability.allow_activity_updates()
9393

9494
token = self.capability.generate_token()
95-
self.assertIsNotNone(token)
95+
self.assertNotEqual(None, token)
9696

9797
decoded = jwt.decode(token, self.auth_token)
98-
self.assertIsNotNone(decoded)
98+
self.assertNotEqual(None, decoded)
9999

100100
policies = decoded['policies']
101101
self.assertEqual(len(policies), 6)
@@ -106,7 +106,7 @@ def test_allow_activity_updates(self):
106106
self.assertEqual(url, policy["url"])
107107
self.assertEqual("POST", policy["method"])
108108
self.assertTrue(policy["allow"])
109-
self.assertIsNotNone(policy['post_filter'])
109+
self.assertNotEqual(None, policy['post_filter'])
110110
self.assertEqual({}, policy['query_filter'])
111111
self.assertTrue(policy['post_filter']['ActivitySid'])
112112

@@ -115,10 +115,10 @@ def test_allow_reservation_updates(self):
115115
self.capability.allow_reservation_updates()
116116

117117
token = self.capability.generate_token()
118-
self.assertIsNotNone(token)
118+
self.assertNotEqual(None, token)
119119

120120
decoded = jwt.decode(token, self.auth_token)
121-
self.assertIsNotNone(decoded)
121+
self.assertNotEqual(None, decoded)
122122

123123
policies = decoded['policies']
124124
self.assertEqual(len(policies), 6)

‎tests/task_router/test_task_router_workspace_capability.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,39 @@ def setUp(self):
3535
def test_generate_token(self):
3636

3737
token = self.capability.generate_token()
38-
self.assertIsNotNone(token)
38+
self.assertNotEqual(None, token)
3939

4040
decoded = jwt.decode(token, self.auth_token)
41-
self.assertIsNotNone(decoded)
41+
self.assertNotEqual(None, decoded)
4242

4343
self.check_decoded(decoded, self.account_sid, self.workspace_sid, self.workspace_sid)
4444

4545
def test_generate_token_with_default_ttl(self):
4646
token = self.capability.generate_token()
47-
self.assertIsNotNone(token)
47+
self.assertNotEqual(None, token)
4848

4949
decoded = jwt.decode(token, self.auth_token)
50-
self.assertIsNotNone(decoded)
50+
self.assertNotEqual(None, decoded)
5151

5252
self.assertEqual(int(time.time()) + 3600, decoded["exp"])
5353

5454
def test_generate_token_with_custom_ttl(self):
5555
ttl = 10000
5656

5757
token = self.capability.generate_token(ttl)
58-
self.assertIsNotNone(token)
58+
self.assertNotEqual(None, token)
5959

6060
decoded = jwt.decode(token, self.auth_token)
61-
self.assertIsNotNone(decoded)
61+
self.assertNotEqual(None, decoded)
6262

6363
self.assertEqual(int(time.time()) + 10000, decoded["exp"])
6464

6565
def test_default(self):
6666
token = self.capability.generate_token()
67-
self.assertIsNotNone(token)
67+
self.assertNotEqual(None, token)
6868

6969
decoded = jwt.decode(token, self.auth_token)
70-
self.assertIsNotNone(decoded)
70+
self.assertNotEqual(None, decoded)
7171

7272
policies = decoded['policies']
7373
self.assertEqual(len(policies), 3)
@@ -83,10 +83,10 @@ def test_allow_fetch_subresources(self):
8383
self.capability.allow_fetch_subresources()
8484

8585
token = self.capability.generate_token()
86-
self.assertIsNotNone(token)
86+
self.assertNotEqual(None, token)
8787

8888
decoded = jwt.decode(token, self.auth_token)
89-
self.assertIsNotNone(decoded)
89+
self.assertNotEqual(None, decoded)
9090

9191
policies = decoded['policies']
9292
self.assertEqual(len(policies), 4)
@@ -100,10 +100,10 @@ def test_allow_updates_subresources(self):
100100
self.capability.allow_updates_subresources()
101101

102102
token = self.capability.generate_token()
103-
self.assertIsNotNone(token)
103+
self.assertNotEqual(None, token)
104104

105105
decoded = jwt.decode(token, self.auth_token)
106-
self.assertIsNotNone(decoded)
106+
self.assertNotEqual(None, decoded)
107107

108108
policies = decoded['policies']
109109
self.assertEqual(len(policies), 4)

‎tests/test_twiml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def setUp(self):
424424
self.task = self.enqueue.find(".//Task")
425425

426426
def test_found_task(self):
427-
self.assertIsNotNone(self.task)
427+
self.assertNotEqual(None, self.task)
428428

429429
def test_enqueue_workflow_sid(self):
430430
self.assertEqual(self.enqueue.get('workflowSid'), "Workflow1")

0 commit comments

Comments
 (0)
0