Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97e0eb9

Browse files
nejchJohnVillalovos
authored andcommitted
test(functional): replace len() calls with list membership checks
1 parent04c6063 commit97e0eb9

14 files changed

+163
-172
lines changed
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
deftest_project_clusters(project):
2-
project.clusters.create(
2+
cluster=project.clusters.create(
33
{
44
"name":"cluster1",
55
"platform_kubernetes_attributes": {
@@ -9,21 +9,20 @@ def test_project_clusters(project):
99
}
1010
)
1111
clusters=project.clusters.list()
12-
assertlen(clusters)==1
12+
assertclusterinclusters
1313

14-
cluster=clusters[0]
1514
cluster.platform_kubernetes_attributes= {"api_url":"http://newurl"}
1615
cluster.save()
1716

1817
cluster=project.clusters.list()[0]
1918
assertcluster.platform_kubernetes["api_url"]=="http://newurl"
2019

2120
cluster.delete()
22-
assertlen(project.clusters.list())==0
21+
assertclusternotinproject.clusters.list()
2322

2423

2524
deftest_group_clusters(group):
26-
group.clusters.create(
25+
cluster=group.clusters.create(
2726
{
2827
"name":"cluster1",
2928
"platform_kubernetes_attributes": {
@@ -33,14 +32,13 @@ def test_group_clusters(group):
3332
}
3433
)
3534
clusters=group.clusters.list()
36-
assertlen(clusters)==1
35+
assertclusterinclusters
3736

38-
cluster=clusters[0]
3937
cluster.platform_kubernetes_attributes= {"api_url":"http://newurl"}
4038
cluster.save()
4139

4240
cluster=group.clusters.list()[0]
4341
assertcluster.platform_kubernetes["api_url"]=="http://newurl"
4442

4543
cluster.delete()
46-
assertlen(group.clusters.list())==0
44+
assertclusternotingroup.clusters.list()

‎tests/functional/api/test_current_user.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
deftest_current_user_email(gl):
22
gl.auth()
33
mail=gl.user.emails.create({"email":"current@user.com"})
4-
assertlen(gl.user.emails.list())==2
4+
assertmailingl.user.emails.list()
55

66
mail.delete()
7-
assertlen(gl.user.emails.list())==1
7+
assertmailnotingl.user.emails.list()
88

99

1010
deftest_current_user_gpg_keys(gl,GPG_KEY):
1111
gl.auth()
1212
gkey=gl.user.gpgkeys.create({"key":GPG_KEY})
13-
assertlen(gl.user.gpgkeys.list())==1
13+
assertgkeyingl.user.gpgkeys.list()
1414

1515
# Seems broken on the gitlab side
1616
gkey=gl.user.gpgkeys.get(gkey.id)
1717
gkey.delete()
18-
assertlen(gl.user.gpgkeys.list())==0
18+
assertgkeynotingl.user.gpgkeys.list()
1919

2020

2121
deftest_current_user_ssh_keys(gl,SSH_KEY):
2222
gl.auth()
2323
key=gl.user.keys.create({"title":"testkey","key":SSH_KEY})
24-
assertlen(gl.user.keys.list())==1
24+
assertkeyingl.user.keys.list()
2525

2626
key.delete()
27-
assertlen(gl.user.keys.list())==0
27+
assertkeynotingl.user.keys.list()
2828

2929

3030
deftest_current_user_status(gl):
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
deftest_project_deploy_keys(gl,project,DEPLOY_KEY):
22
deploy_key=project.keys.create({"title":"foo@bar","key":DEPLOY_KEY})
3-
project_keys=list(project.keys.list())
4-
assertlen(project_keys)==1
3+
assertdeploy_keyinproject.keys.list()
54

65
project2=gl.projects.create({"name":"deploy-key-project"})
76
project2.keys.enable(deploy_key.id)
8-
assertlen(project2.keys.list())==1
7+
assertdeploy_keyinproject2.keys.list()
98

109
project2.keys.delete(deploy_key.id)
11-
assertlen(project2.keys.list())==0
10+
assertdeploy_keynotinproject2.keys.list()
1211
project2.delete()

‎tests/functional/api/test_deploy_tokens.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ def test_project_deploy_tokens(gl, project):
77
"scopes": ["read_registry"],
88
}
99
)
10-
assertlen(project.deploytokens.list())==1
11-
assertgl.deploytokens.list()==project.deploytokens.list()
10+
assertdeploy_tokeninproject.deploytokens.list()
11+
assertset(project.deploytokens.list())<=set(gl.deploytokens.list())
1212

1313
deploy_token=project.deploytokens.get(deploy_token.id)
1414
assertdeploy_token.name=="foo"
@@ -17,8 +17,8 @@ def test_project_deploy_tokens(gl, project):
1717
assertdeploy_token.username=="bar"
1818

1919
deploy_token.delete()
20-
assertlen(project.deploytokens.list())==0
21-
assertlen(gl.deploytokens.list())==0
20+
assertdeploy_tokennotinproject.deploytokens.list()
21+
assertdeploy_tokennotingl.deploytokens.list()
2222

2323

2424
deftest_group_deploy_tokens(gl,group):
@@ -29,13 +29,13 @@ def test_group_deploy_tokens(gl, group):
2929
}
3030
)
3131

32-
assertlen(group.deploytokens.list())==1
33-
assertgl.deploytokens.list()==group.deploytokens.list()
32+
assertdeploy_tokeningroup.deploytokens.list()
33+
assertset(group.deploytokens.list())<=set(gl.deploytokens.list())
3434

3535
deploy_token=group.deploytokens.get(deploy_token.id)
3636
assertdeploy_token.name=="foo"
3737
assertdeploy_token.scopes== ["read_registry"]
3838

3939
deploy_token.delete()
40-
assertlen(group.deploytokens.list())==0
41-
assertlen(gl.deploytokens.list())==0
40+
assertdeploy_tokennotingroup.deploytokens.list()
41+
assertdeploy_tokennotingl.deploytokens.list()

‎tests/functional/api/test_gitlab.py‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
importwarnings
2-
31
importpytest
42

53
importgitlab
@@ -27,7 +25,7 @@ def test_broadcast_messages(gl):
2725
assertmsg.color=="#444444"
2826

2927
msg.delete()
30-
assertlen(gl.broadcastmessages.list())==0
28+
assertmsgnotingl.broadcastmessages.list()
3129

3230

3331
deftest_markdown(gl):
@@ -109,10 +107,10 @@ def test_template_license(gl):
109107

110108
deftest_hooks(gl):
111109
hook=gl.hooks.create({"url":"http://whatever.com"})
112-
assertlen(gl.hooks.list())==1
110+
asserthookingl.hooks.list()
113111

114112
hook.delete()
115-
assertlen(gl.hooks.list())==0
113+
asserthooknotingl.hooks.list()
116114

117115

118116
deftest_namespaces(gl):
@@ -151,10 +149,10 @@ def test_events(gl):
151149
deftest_features(gl):
152150
feat=gl.features.set("foo",30)
153151
assertfeat.name=="foo"
154-
assertlen(gl.features.list())==1
152+
assertfeatingl.features.list()
155153

156154
feat.delete()
157-
assertlen(gl.features.list())==0
155+
assertfeatnotingl.features.list()
158156

159157

160158
deftest_pagination(gl,project):
@@ -198,54 +196,46 @@ def test_rate_limits(gl):
198196
deftest_list_default_warning(gl):
199197
"""When there are more than 20 items and use default `list()` then warning is
200198
generated"""
201-
withwarnings.catch_warnings(record=True)ascaught_warnings:
199+
withpytest.warns(UserWarning,match="python-gitlab.readthedocs.io")asrecord:
202200
gl.gitlabciymls.list()
203-
assertlen(caught_warnings)==1
204-
warning=caught_warnings[0]
205-
assertisinstance(warning.message,UserWarning)
206-
message=str(warning.message)
207-
assert"python-gitlab.readthedocs.io"inmessage
201+
202+
assertlen(record)==1
203+
warning=record[0]
208204
assert__file__==warning.filename
209205

210206

211-
deftest_list_page_nowarning(gl):
207+
deftest_list_page_nowarning(gl,recwarn):
212208
"""Using `page=X` will disable the warning"""
213-
withwarnings.catch_warnings(record=True)ascaught_warnings:
214-
gl.gitlabciymls.list(page=1)
215-
assertlen(caught_warnings)==0
209+
gl.gitlabciymls.list(page=1)
210+
assertnotrecwarn
216211

217212

218-
deftest_list_all_false_nowarning(gl):
213+
deftest_list_all_false_nowarning(gl,recwarn):
219214
"""Using `all=False` will disable the warning"""
220-
withwarnings.catch_warnings(record=True)ascaught_warnings:
221-
gl.gitlabciymls.list(all=False)
222-
assertlen(caught_warnings)==0
215+
gl.gitlabciymls.list(all=False)
216+
assertnotrecwarn
223217

224218

225-
deftest_list_all_true_nowarning(gl):
219+
deftest_list_all_true_nowarning(gl,recwarn):
226220
"""Using `all=True` will disable the warning"""
227-
withwarnings.catch_warnings(record=True)ascaught_warnings:
228-
items=gl.gitlabciymls.list(all=True)
229-
assertlen(caught_warnings)==0
221+
items=gl.gitlabciymls.list(all=True)
222+
assertnotrecwarn
230223
assertlen(items)>20
231224

232225

233-
deftest_list_iterator_true_nowarning(gl):
226+
deftest_list_iterator_true_nowarning(gl,recwarn):
234227
"""Using `iterator=True` will disable the warning"""
235-
withwarnings.catch_warnings(record=True)ascaught_warnings:
236-
items=gl.gitlabciymls.list(iterator=True)
237-
assertlen(caught_warnings)==0
228+
items=gl.gitlabciymls.list(iterator=True)
229+
assertnotrecwarn
238230
assertlen(list(items))>20
239231

240232

241233
deftest_list_as_list_false_warnings(gl):
242234
"""Using `as_list=False` will disable the UserWarning but cause a
243235
DeprecationWarning"""
244-
withwarnings.catch_warnings(record=True)ascaught_warnings:
236+
withpytest.warns(DeprecationWarning)asrecord:
245237
items=gl.gitlabciymls.list(as_list=False)
246-
assertlen(caught_warnings)==1
247-
forwarningincaught_warnings:
248-
assertisinstance(warning.message,DeprecationWarning)
238+
assertlen(record)==1
249239
assertlen(list(items))>20
250240

251241

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp