Show total and number of attachments checked (#1662)

Author: leplatrem

checks/remotesettings/attachments_availability.py

@@ -53,9 +53,14 @@ async def run(server: str, slice_percent: tuple[int, int] = (0, 100)) -> CheckRe
 
     lower_idx = math.floor(slice_percent[0] / 100.0 * len(urls))
     upper_idx = math.ceil(slice_percent[1] / 100.0 * len(urls))
+    sliced = urls[lower_idx:upper_idx]
 
-    futures = [test_url(url) for url in urls[lower_idx:upper_idx]]
+    futures = [test_url(url) for url in sliced]
     results = await run_parallel(*futures)
-    missing = [url for url, success in zip(urls, results) if not success]
+    missing = [url for url, success in zip(sliced, results) if not success]
 
-    return len(missing) == 0, {"missing": missing, "checked": len(urls)}
+    return len(missing) == 0, {
+        "missing": missing,
+        "checked": len(sliced),
+        "total": len(urls),
+    }

checks/remotesettings/attachments_integrity.py

@@ -79,10 +79,13 @@ async def run(server: str, slice_percent: tuple[int, int] = (0, 100)) -> CheckRe
 
     lower_idx = math.floor(slice_percent[0] / 100.0 * len(attachments))
     upper_idx = math.ceil(slice_percent[1] / 100.0 * len(attachments))
+    sliced = attachments[lower_idx:upper_idx]
 
-    futures = [
-        test_attachment(attachment) for attachment in attachments[lower_idx:upper_idx]
-    ]
+    futures = [test_attachment(attachment) for attachment in sliced]
     results = await run_parallel(*futures)
     bad = [result for result, success in results if not success]
-    return len(bad) == 0, {"bad": bad, "checked": len(attachments)}
+    return len(bad) == 0, {
+        "bad": bad,
+        "checked": len(sliced),
+        "total": len(attachments),
+    }

tests/checks/remotesettings/test_attachments_availability.py

@@ -41,7 +41,7 @@ async def test_positive(mock_aioresponses):
     status, data = await run(server_url)
 
     # assert status is True
-    assert data == {"missing": [], "checked": 2}
+    assert data == {"missing": [], "checked": 2, "total": 2}
 
 
 async def test_negative(mock_aioresponses, no_sleep):
@@ -79,7 +79,7 @@ async def test_negative(mock_aioresponses, no_sleep):
     status, data = await run(server_url)
 
     assert status is False
-    assert data == {"missing": ["http://cdn/missing.jpg"], "checked": 2}
+    assert data == {"missing": ["http://cdn/missing.jpg"], "checked": 2, "total": 2}
 
 
 @pytest.mark.parametrize(

tests/checks/remotesettings/test_attachments_integrity.py

@@ -55,7 +55,7 @@ async def test_positive(mock_aioresponses):
     status, data = await run(server_url)
 
     # assert status is True
-    assert data == {"bad": [], "checked": 2}
+    assert data == {"bad": [], "checked": 2, "total": 2}
 
 
 async def test_negative(mock_aioresponses):
@@ -130,6 +130,7 @@ async def test_negative(mock_aioresponses):
             },
         ],
         "checked": 4,
+        "total": 4,
     }