Skip to content

Commit 0b21eaa

Browse files
jooolajooola
committed
style: format test case
- Make it more breathable, - Break calls on multiple lines
1 parent 4698975 commit 0b21eaa

File tree

17 files changed

+1242
-303
lines changed

17 files changed

+1242
-303
lines changed

‎tests/unit/actions/test_client.py‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,17 @@ def test_wait_until_finished(
3030
running_action,
3131
successfully_action,
3232
):
33-
request_mock.side_effect = [running_action, successfully_action]
33+
request_mock.side_effect = [
34+
running_action,
35+
successfully_action,
36+
]
37+
3438
bound_running_action.wait_until_finished()
35-
request_mock.assert_called_with(url="/actions/2", method="GET")
39+
40+
request_mock.assert_called_with(
41+
method="GET",
42+
url="/actions/2",
43+
)
3644

3745
assert bound_running_action.status == "success"
3846
assert request_mock.call_count == 2
@@ -83,8 +91,13 @@ def test_get_by_id(
8391
generic_action,
8492
):
8593
request_mock.return_value = generic_action
94+
8695
action = actions_client.get_by_id(1)
87-
request_mock.assert_called_with(url="/resource/actions/1", method="GET")
96+
97+
request_mock.assert_called_with(
98+
method="GET",
99+
url="/resource/actions/1",
100+
)
88101
assert action._client == actions_client._parent.actions
89102
assert action.id == 1
90103
assert action.command == "stop_server"
@@ -101,9 +114,13 @@ def test_get_list(
101114
params,
102115
):
103116
request_mock.return_value = generic_action_list
117+
104118
result = actions_client.get_list(**params)
119+
105120
request_mock.assert_called_with(
106-
url="/resource/actions", method="GET", params=params
121+
method="GET",
122+
url="/resource/actions",
123+
params=params,
107124
)
108125

109126
assert result.meta is not None
@@ -131,12 +148,15 @@ def test_get_all(
131148
params,
132149
):
133150
request_mock.return_value = generic_action_list
151+
134152
actions = actions_client.get_all(**params)
135153

136154
params.update({"page": 1, "per_page": 50})
137155

138156
request_mock.assert_called_with(
139-
url="/resource/actions", method="GET", params=params
157+
method="GET",
158+
url="/resource/actions",
159+
params=params,
140160
)
141161

142162
assert len(actions) == 2
@@ -165,8 +185,13 @@ def test_get_by_id(
165185
generic_action,
166186
):
167187
request_mock.return_value = generic_action
188+
168189
action = actions_client.get_by_id(1)
169-
request_mock.assert_called_with(url="/actions/1", method="GET")
190+
191+
request_mock.assert_called_with(
192+
method="GET",
193+
url="/actions/1",
194+
)
170195
assert action._client == actions_client._parent.actions
171196
assert action.id == 1
172197
assert action.command == "stop_server"
@@ -183,9 +208,15 @@ def test_get_list(
183208
params,
184209
):
185210
request_mock.return_value = generic_action_list
211+
186212
with pytest.deprecated_call():
187213
result = actions_client.get_list(**params)
188-
request_mock.assert_called_with(url="/actions", method="GET", params=params)
214+
215+
request_mock.assert_called_with(
216+
method="GET",
217+
url="/actions",
218+
params=params,
219+
)
189220

190221
assert result.meta is not None
191222

@@ -212,12 +243,17 @@ def test_get_all(
212243
params,
213244
):
214245
request_mock.return_value = generic_action_list
246+
215247
with pytest.deprecated_call():
216248
actions = actions_client.get_all(**params)
217249

218250
params.update({"page": 1, "per_page": 50})
219251

220-
request_mock.assert_called_with(url="/actions", method="GET", params=params)
252+
request_mock.assert_called_with(
253+
method="GET",
254+
url="/actions",
255+
params=params,
256+
)
221257

222258
assert len(actions) == 2
223259

‎tests/unit/certificates/test_client.py‎

Lines changed: 74 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ def test_get_actions_list(
2929
params,
3030
):
3131
request_mock.return_value = response_get_actions
32+
3233
result = bound_certificate.get_actions_list(**params)
34+
3335
request_mock.assert_called_with(
34-
url="/certificates/14/actions", method="GET", params=params
36+
method="GET",
37+
url="/certificates/14/actions",
38+
params=params,
3539
)
3640

3741
actions = result.actions
@@ -51,12 +55,15 @@ def test_get_actions(
5155
response_get_actions,
5256
):
5357
request_mock.return_value = response_get_actions
58+
5459
actions = bound_certificate.get_actions()
5560

5661
params = {"page": 1, "per_page": 50}
5762

5863
request_mock.assert_called_with(
59-
url="/certificates/14/actions", method="GET", params=params
64+
method="GET",
65+
url="/certificates/14/actions",
66+
params=params,
6067
)
6168

6269
assert len(actions) == 1
@@ -95,9 +102,13 @@ def test_update(
95102
response_update_certificate,
96103
):
97104
request_mock.return_value = response_update_certificate
105+
98106
certificate = bound_certificate.update(name="New name")
107+
99108
request_mock.assert_called_with(
100-
url="/certificates/14", method="PUT", json={"name": "New name"}
109+
method="PUT",
110+
url="/certificates/14",
111+
json={"name": "New name"},
101112
)
102113

103114
assert certificate.id == 2323
@@ -110,8 +121,13 @@ def test_delete(
110121
generic_action,
111122
):
112123
request_mock.return_value = generic_action
124+
113125
delete_success = bound_certificate.delete()
114-
request_mock.assert_called_with(url="/certificates/14", method="DELETE")
126+
127+
request_mock.assert_called_with(
128+
method="DELETE",
129+
url="/certificates/14",
130+
)
115131

116132
assert delete_success is True
117133

@@ -122,9 +138,12 @@ def test_retry_issuance(
122138
response_retry_issuance_action,
123139
):
124140
request_mock.return_value = response_retry_issuance_action
141+
125142
action = bound_certificate.retry_issuance()
143+
126144
request_mock.assert_called_with(
127-
url="/certificates/14/actions/retry", method="POST"
145+
method="POST",
146+
url="/certificates/14/actions/retry",
128147
)
129148

130149
assert action.id == 14
@@ -143,8 +162,13 @@ def test_get_by_id(
143162
certificate_response,
144163
):
145164
request_mock.return_value = certificate_response
165+
146166
certificate = certificates_client.get_by_id(1)
147-
request_mock.assert_called_with(url="/certificates/1", method="GET")
167+
168+
request_mock.assert_called_with(
169+
method="GET",
170+
url="/certificates/1",
171+
)
148172
assert certificate._client is certificates_client
149173
assert certificate.id == 2323
150174
assert certificate.name == "My Certificate"
@@ -170,9 +194,13 @@ def test_get_list(
170194
params,
171195
):
172196
request_mock.return_value = two_certificates_response
197+
173198
result = certificates_client.get_list(**params)
199+
174200
request_mock.assert_called_with(
175-
url="/certificates", method="GET", params=params
201+
method="GET",
202+
url="/certificates",
203+
params=params,
176204
)
177205

178206
certificates = result.certificates
@@ -200,11 +228,15 @@ def test_get_all(
200228
params,
201229
):
202230
request_mock.return_value = two_certificates_response
231+
203232
certificates = certificates_client.get_all(**params)
204233

205234
params.update({"page": 1, "per_page": 50})
235+
206236
request_mock.assert_called_with(
207-
url="/certificates", method="GET", params=params
237+
method="GET",
238+
url="/certificates",
239+
params=params,
208240
)
209241

210242
assert len(certificates) == 2
@@ -227,11 +259,15 @@ def test_get_by_name(
227259
one_certificates_response,
228260
):
229261
request_mock.return_value = one_certificates_response
262+
230263
certificates = certificates_client.get_by_name("My Certificate")
231264

232265
params = {"name": "My Certificate"}
266+
233267
request_mock.assert_called_with(
234-
url="/certificates", method="GET", params=params
268+
method="GET",
269+
url="/certificates",
270+
params=params,
235271
)
236272

237273
assert certificates._client is certificates_client
@@ -245,14 +281,16 @@ def test_create(
245281
certificate_response,
246282
):
247283
request_mock.return_value = certificate_response
284+
248285
certificate = certificates_client.create(
249286
name="My Certificate",
250287
certificate="-----BEGIN CERTIFICATE-----\n...",
251288
private_key="-----BEGIN PRIVATE KEY-----\n...",
252289
)
290+
253291
request_mock.assert_called_with(
254-
url="/certificates",
255292
method="POST",
293+
url="/certificates",
256294
json={
257295
"name": "My Certificate",
258296
"certificate": "-----BEGIN CERTIFICATE-----\n...",
@@ -271,12 +309,14 @@ def test_create_managed(
271309
create_managed_certificate_response,
272310
):
273311
request_mock.return_value = create_managed_certificate_response
312+
274313
create_managed_certificate_rsp = certificates_client.create_managed(
275314
name="My Certificate", domain_names=["example.com", "*.example.org"]
276315
)
316+
277317
request_mock.assert_called_with(
278-
url="/certificates",
279318
method="POST",
319+
url="/certificates",
280320
json={
281321
"name": "My Certificate",
282322
"domain_names": ["example.com", "*.example.org"],
@@ -301,9 +341,13 @@ def test_update(
301341
response_update_certificate,
302342
):
303343
request_mock.return_value = response_update_certificate
344+
304345
certificate = certificates_client.update(certificate, name="New name")
346+
305347
request_mock.assert_called_with(
306-
url="/certificates/1", method="PUT", json={"name": "New name"}
348+
method="PUT",
349+
url="/certificates/1",
350+
json={"name": "New name"},
307351
)
308352

309353
assert certificate.id == 2323
@@ -321,8 +365,13 @@ def test_delete(
321365
generic_action,
322366
):
323367
request_mock.return_value = generic_action
368+
324369
delete_success = certificates_client.delete(certificate)
325-
request_mock.assert_called_with(url="/certificates/1", method="DELETE")
370+
371+
request_mock.assert_called_with(
372+
method="DELETE",
373+
url="/certificates/1",
374+
)
326375

327376
assert delete_success is True
328377

@@ -338,9 +387,12 @@ def test_retry_issuance(
338387
response_retry_issuance_action,
339388
):
340389
request_mock.return_value = response_retry_issuance_action
390+
341391
action = certificates_client.retry_issuance(certificate)
392+
342393
request_mock.assert_called_with(
343-
url="/certificates/1/actions/retry", method="POST"
394+
method="POST",
395+
url="/certificates/1/actions/retry",
344396
)
345397

346398
assert action.id == 14
@@ -355,7 +407,10 @@ def test_actions_get_by_id(
355407
request_mock.return_value = {"action": response_get_actions["actions"][0]}
356408
action = certificates_client.actions.get_by_id(13)
357409

358-
request_mock.assert_called_with(url="/certificates/actions/13", method="GET")
410+
request_mock.assert_called_with(
411+
method="GET",
412+
url="/certificates/actions/13",
413+
)
359414

360415
assert isinstance(action, BoundAction)
361416
assert action._client == certificates_client._parent.actions
@@ -369,11 +424,12 @@ def test_actions_get_list(
369424
response_get_actions,
370425
):
371426
request_mock.return_value = response_get_actions
427+
372428
result = certificates_client.actions.get_list()
373429

374430
request_mock.assert_called_with(
375-
url="/certificates/actions",
376431
method="GET",
432+
url="/certificates/actions",
377433
params={},
378434
)
379435

@@ -393,11 +449,12 @@ def test_actions_get_all(
393449
response_get_actions,
394450
):
395451
request_mock.return_value = response_get_actions
452+
396453
actions = certificates_client.actions.get_all()
397454

398455
request_mock.assert_called_with(
399-
url="/certificates/actions",
400456
method="GET",
457+
url="/certificates/actions",
401458
params={"page": 1, "per_page": 50},
402459
)
403460

0 commit comments

Comments
 (0)