Skip to content

Commit 646c2ac

Browse files
Muhammad Faraz  MaqsoodFaraz32123
authored andcommitted
fix: move links with status None to forbidden link
- move external links with status None to external forbidden links - also modified the tests that fails for previous code
1 parent c6f75df commit 646c2ac

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cms/djangoapps/contentstore/tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,13 +1369,13 @@ def _filter_by_status(results):
13691369
retry_list = []
13701370
for result in results:
13711371
status, block_id, url = result['status'], result['block_id'], result['url']
1372-
if status is None:
1372+
if status is None and _is_studio_url(url):
13731373
retry_list.append([block_id, url])
13741374
elif status == 200:
13751375
continue
13761376
elif status == 403 and _is_studio_url(url):
13771377
filtered_results.append([block_id, url, LinkState.LOCKED])
1378-
elif status == 403 and not _is_studio_url(url):
1378+
elif status in [403, None] and not _is_studio_url(url):
13791379
filtered_results.append([block_id, url, LinkState.EXTERNAL_FORBIDDEN])
13801380
else:
13811381
filtered_results.append([block_id, url, LinkState.BROKEN])

cms/djangoapps/contentstore/tests/test_tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,18 +498,20 @@ def test_filter_by_status(self):
498498
{'status': 200, 'block_id': 'block1', 'url': 'https://example.com'},
499499
{'status': None, 'block_id': 'block2', 'url': 'https://retry.com'},
500500
{'status': 403, 'block_id': 'block3', 'url': 'https://' + settings.CMS_BASE},
501+
{'status': None, 'block_id': 'block3', 'url': 'https://' + settings.CMS_BASE},
501502
{'status': 403, 'block_id': 'block4', 'url': 'https://external.com'},
502503
{'status': 404, 'block_id': 'block5', 'url': 'https://broken.com'}
503504
]
504505

505506
expected_filtered_results = [
507+
['block2', 'https://retry.com', LinkState.EXTERNAL_FORBIDDEN],
506508
['block3', 'https://' + settings.CMS_BASE, LinkState.LOCKED],
507509
['block4', 'https://external.com', LinkState.EXTERNAL_FORBIDDEN],
508510
['block5', 'https://broken.com', LinkState.BROKEN],
509511
]
510512

511513
expected_retry_list = [
512-
['block2', 'https://retry.com']
514+
['block3', 'https://' + settings.CMS_BASE]
513515
]
514516

515517
filtered_results, retry_list = _filter_by_status(results)

0 commit comments

Comments
 (0)