Skip to content

Commit d22622b

Browse files
Fix checking of PR labels (#2334)
Fix checking of PR labels The labels are GithubLabel objects and not strings, so we need to check their name attribute. RELEASE NOTES BEGIN N/A RELEASE NOTES END Reviewed-by: František Lachman <[email protected]> Reviewed-by: Laura Barcziová
2 parents 577555c + cb60e6f commit d22622b

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

packit_service/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def pr_labels_match_configuration(
243243
f"(label.present: {configured_labels_present}, label.absent: {configured_labels_absent})"
244244
)
245245

246-
pr_labels = pull_request.labels
246+
pr_labels = [label.name for label in pull_request.labels]
247247
logger.info(f"Labels on PR: {pr_labels}")
248248

249249
return (

tests/unit/test_checkers.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1000,10 +1000,15 @@ def test_koji_check_allowed_accounts(
10001000
"pr_labels,labels_present,labels_absent,should_pass",
10011001
(
10021002
([], [], [], True),
1003-
(["allowed-1"], [], ["skip-ci"], True),
1004-
(["allowed-1"], ["allowed-1"], ["skip-ci"], True),
1005-
(["allowed-1"], ["allowed-1"], ["skip-ci"], True),
1006-
(["allowed-1", "skip-ci"], ["allowed-1"], ["skip-ci"], False),
1003+
([flexmock(name="allowed-1")], [], ["skip-ci"], True),
1004+
([flexmock(name="allowed-1")], ["allowed-1"], ["skip-ci"], True),
1005+
([flexmock(name="allowed-1")], ["allowed-1"], ["skip-ci"], True),
1006+
(
1007+
[flexmock(name="allowed-1"), flexmock(name="skip-ci")],
1008+
["allowed-1"],
1009+
["skip-ci"],
1010+
False,
1011+
),
10071012
),
10081013
)
10091014
def test_labels_on_distgit_pr(

tests/unit/test_utils.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -90,31 +90,31 @@ def f(one, two, three="something"):
9090
pytest.param(
9191
[],
9292
["my-label"],
93-
["my-label"],
93+
[flexmock(name="my-label")],
9494
True,
9595
),
9696
pytest.param(
9797
["skip-ci"],
9898
["my-label"],
99-
["my-label"],
99+
[flexmock(name="my-label")],
100100
True,
101101
),
102102
pytest.param(
103103
["skip-ci"],
104104
["my-label"],
105-
["my-label", "skip-ci"],
105+
[flexmock(name="my-label"), flexmock(name="skip-ci")],
106106
False,
107107
),
108108
pytest.param(
109109
["skip-ci"],
110110
["my-label"],
111-
["skip-ci"],
111+
[flexmock(name="skip-ci")],
112112
False,
113113
),
114114
pytest.param(
115115
["skip-ci"],
116116
[],
117-
["skip-ci"],
117+
[flexmock(name="skip-ci")],
118118
False,
119119
),
120120
pytest.param(
@@ -126,19 +126,19 @@ def f(one, two, three="something"):
126126
pytest.param(
127127
["skip-ci"],
128128
["first", "second"],
129-
["second"],
129+
[flexmock(name="second")],
130130
True,
131131
),
132132
pytest.param(
133133
["skip-ci"],
134134
["first", "second"],
135-
["third"],
135+
[flexmock(name="third")],
136136
False,
137137
),
138138
pytest.param(
139139
["skip-ci", "block-ci"],
140140
["first", "second"],
141-
["block-ci"],
141+
[flexmock(name="block-ci")],
142142
False,
143143
),
144144
pytest.param(
@@ -150,7 +150,7 @@ def f(one, two, three="something"):
150150
pytest.param(
151151
[],
152152
[],
153-
["some-label"],
153+
[flexmock(name="some-label")],
154154
True,
155155
),
156156
],

0 commit comments

Comments
 (0)