1212 TWINE_WHEEL_URL ,
1313)
1414
15- YANK_AUTH = ("admin" , "password" )
1615TWINE_NAME = "twine"
1716TWINE_VERSION = "5.1.0"
1817
1918TWINE_500_WHEEL_FILENAME = "twine-5.0.0-py3-none-any.whl"
2019TWINE_500_WHEEL_URL = urljoin (urljoin (PYTHON_FIXTURES_URL , "packages/" ), TWINE_500_WHEEL_FILENAME )
2120
2221
23- def yank (distro , name , version , yanked_reason = "" ):
24- url = urljoin (distro .base_url , "yank/" )
25- return requests .post (
26- url , json = {"name" : name , "version" : version , "yanked_reason" : yanked_reason }, auth = YANK_AUTH
27- )
28-
29-
30- def unyank (distro , name , version ):
31- url = urljoin (distro .base_url , "unyank/" )
32- return requests .post (url , json = {"name" : name , "version" : version }, auth = YANK_AUTH )
33-
34-
3522def test_yank_and_unyank (
3623 delete_orphans_pre ,
3724 monitor_task ,
@@ -58,9 +45,11 @@ def test_yank_and_unyank(
5845 version_1 = repo .latest_version_href
5946
6047 # 1. Yank
61- response = yank (distro , TWINE_NAME , TWINE_VERSION , yanked_reason = "broken" )
62- assert response .status_code == 202
63- monitor_task (response .json ()["task" ])
48+ response = python_bindings .PypiYankApi .yank (
49+ path = distro .base_path ,
50+ yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION , "yanked_reason" : "broken" },
51+ )
52+ monitor_task (response .task )
6453
6554 repo = python_bindings .RepositoriesPythonApi .read (repo .pulp_href )
6655 version_2 = repo .latest_version_href
@@ -92,17 +81,21 @@ def test_yank_and_unyank(
9281 assert f ["yanked_reason" ] == "broken"
9382
9483 # Yank again with same reason - idempotent, no new repo version
95- response = yank (distro , TWINE_NAME , TWINE_VERSION , yanked_reason = "broken" )
96- assert response .status_code == 202
97- monitor_task (response .json ()["task" ])
84+ response = python_bindings .PypiYankApi .yank (
85+ path = distro .base_path ,
86+ yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION , "yanked_reason" : "broken" },
87+ )
88+ monitor_task (response .task )
9889
9990 repo = python_bindings .RepositoriesPythonApi .read (repo .pulp_href )
10091 assert repo .latest_version_href == version_2
10192
10293 # Yank again with different reason - updates the reason
103- response = yank (distro , TWINE_NAME , TWINE_VERSION , yanked_reason = "security fix" )
104- assert response .status_code == 202
105- monitor_task (response .json ()["task" ])
94+ response = python_bindings .PypiYankApi .yank (
95+ path = distro .base_path ,
96+ yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION , "yanked_reason" : "security fix" },
97+ )
98+ monitor_task (response .task )
10699
107100 repo = python_bindings .RepositoriesPythonApi .read (repo .pulp_href )
108101 version_3 = repo .latest_version_href
@@ -117,9 +110,10 @@ def test_yank_and_unyank(
117110 assert response .text .count ('data-yanked="security fix"' ) == 2
118111
119112 # 2. Unyank
120- response = unyank (distro , TWINE_NAME , TWINE_VERSION )
121- assert response .status_code == 202
122- monitor_task (response .json ()["task" ])
113+ response = python_bindings .PypiUnyankApi .unyank (
114+ path = distro .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
115+ )
116+ monitor_task (response .task )
123117
124118 repo = python_bindings .RepositoriesPythonApi .read (repo .pulp_href )
125119 version_4 = repo .latest_version_href
@@ -149,9 +143,10 @@ def test_yank_and_unyank(
149143 assert f ["yanked_reason" ] is None
150144
151145 # Unyank again - idempotent, no new repo version
152- response = unyank (distro , TWINE_NAME , TWINE_VERSION )
153- assert response .status_code == 202
154- monitor_task (response .json ()["task" ])
146+ response = python_bindings .PypiUnyankApi .unyank (
147+ path = distro .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
148+ )
149+ monitor_task (response .task )
155150
156151 repo = python_bindings .RepositoriesPythonApi .read (repo .pulp_href )
157152 assert repo .latest_version_href == version_4
@@ -207,9 +202,11 @@ def test_partial_yank(
207202 monitor_task (python_bindings .RepositoriesPythonApi .modify (repo .pulp_href , body ).task )
208203 distro = python_distribution_factory (repository = repo )
209204
210- response = yank (distro , TWINE_NAME , TWINE_VERSION , yanked_reason = "broken 5.1.0" )
211- assert response .status_code == 202
212- monitor_task (response .json ()["task" ])
205+ response = python_bindings .PypiYankApi .yank (
206+ path = distro .base_path ,
207+ yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION , "yanked_reason" : "broken 5.1.0" },
208+ )
209+ monitor_task (response .task )
213210
214211 summary = python_content_summary (repository = repo , version = 2 )
215212 assert summary .added ["python.python_yank" ]["count" ] == 1
@@ -249,9 +246,10 @@ def test_yank_isolation_across_repositories(
249246 distro_b = python_distribution_factory (repository = repo_b )
250247
251248 # Yank in repo A only
252- response = yank (distro_a , TWINE_NAME , TWINE_VERSION )
253- assert response .status_code == 202
254- monitor_task (response .json ()["task" ])
249+ response = python_bindings .PypiYankApi .yank (
250+ path = distro_a .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
251+ )
252+ monitor_task (response .task )
255253
256254 # Repo A should have a yank marker, repo B should not
257255 summary_a = python_content_summary (repository = repo_a , version = 2 )
@@ -260,13 +258,15 @@ def test_yank_isolation_across_repositories(
260258 assert "python.python_yank" not in summary_b .present
261259
262260 # Yank in repo B too, then unyank only in repo A
263- response = yank (distro_b , TWINE_NAME , TWINE_VERSION )
264- assert response .status_code == 202
265- monitor_task (response .json ()["task" ])
261+ response = python_bindings .PypiYankApi .yank (
262+ path = distro_b .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
263+ )
264+ monitor_task (response .task )
266265
267- response = unyank (distro_a , TWINE_NAME , TWINE_VERSION )
268- assert response .status_code == 202
269- monitor_task (response .json ()["task" ])
266+ response = python_bindings .PypiUnyankApi .unyank (
267+ path = distro_a .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
268+ )
269+ monitor_task (response .task )
270270
271271 # Repo A should be not-yanked, repo B should remain yanked
272272 summary_a = python_content_summary (repository = repo_a , version = 3 )
@@ -276,23 +276,31 @@ def test_yank_isolation_across_repositories(
276276
277277
278278@pytest .mark .parallel
279- def test_yank_nonexistent_package (python_repo_factory , python_distribution_factory ):
279+ def test_yank_nonexistent_package (
280+ python_bindings , python_repo_factory , python_distribution_factory
281+ ):
280282 """
281283 Yanking a package not in the repo should return 404.
282284 """
283285 repo = python_repo_factory ()
284286 distro = python_distribution_factory (repository = repo )
285287
286- response = yank (distro , "nonexistent-package" , "99.99.99" )
287- assert response .status_code == 404
288+ with pytest .raises (python_bindings .ApiException ) as exc :
289+ python_bindings .PypiYankApi .yank (
290+ path = distro .base_path , yank = {"name" : "nonexistent-package" , "version" : "99.99.99" }
291+ )
292+ assert exc .value .status == 404
288293
289294
290295@pytest .mark .parallel
291- def test_yank_no_repository (python_distribution_factory ):
296+ def test_yank_no_repository (python_bindings , python_distribution_factory ):
292297 """
293298 Yanking on a distribution with no repository should return 400.
294299 """
295300 distro = python_distribution_factory ()
296301
297- response = yank (distro , TWINE_NAME , TWINE_VERSION )
298- assert response .status_code == 400
302+ with pytest .raises (python_bindings .ApiException ) as exc :
303+ python_bindings .PypiYankApi .yank (
304+ path = distro .base_path , yank = {"name" : TWINE_NAME , "version" : TWINE_VERSION }
305+ )
306+ assert exc .value .status == 400
0 commit comments