unittest wip

ICTU · Feb 4, 2025 · c3d90bc · c3d90bc
1 parent 84b9b74
commit c3d90bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/components/collector/src/source_collectors/bitbucket/merge_requests.py b/components/collector/src/source_collectors/bitbucket/merge_requests.py
@@ -47,8 +47,7 @@ async def _parse_entities(self, responses: SourceResponses) -> Entities:
 
     async def _parse_total(self, responses: SourceResponses) -> Value:
         """Override to parse the total number of merge requests from the responses."""
-        merge_requests = [len((await response.json())["values"]) for response in responses]
-        return str(sum(merge_requests))
+        return str((await responses.json())["size"])
 
     def _create_entity(self, merge_request, landing_url: str) -> Entity:
         """Create an entity from a Bitbucket JSON result."""

diff --git a/components/collector/tests/source_collectors/bitbucket/test_merge_requests.py b/components/collector/tests/source_collectors/bitbucket/test_merge_requests.py
@@ -78,21 +78,21 @@ async def test_pagination(self):
         """Test that pagination works."""
         BitbucketMergeRequests.PAGE_SIZE = 1
         bitbucket_json = [
-            { "Hallo": True, "isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
-            { "isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
-            { "isLastPage": True, "values": [self.create_merge_request(3)]},
-            {"isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
-            {"isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
-            {"isLastPage": True, "values": [self.create_merge_request(3)]},
-            {"isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
-            {"isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
-            {"isLastPage": True, "values": [self.create_merge_request(3)]},
+            { "size": len("values"), "Hallo": True, "isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
+            { "size": len("values"), "isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
+            { "size": len("values"), "isLastPage": True, "values": [self.create_merge_request(3)]},
+            { "size": len("values"), "isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
+            { "size": len("values"), "isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
+            { "size": len("values"), "isLastPage": True, "values": [self.create_merge_request(3)]},
+            { "size": len("values"), "isLastPage": False, "nextPageStart": 1, "values": [self.create_merge_request(1)]},
+            { "size": len("values"), "isLastPage": False, "nextPageStart": 2, "values": [self.create_merge_request(2)]},
+            { "size": len("values"), "isLastPage": True, "values": [self.create_merge_request(3)]},
         ]
         response = await self.collect(get_request_json_side_effect=bitbucket_json)
         self.assert_measurement(
             response,
             value="3",
-            total="9",
+            total="6",
             entities=[self.create_entity(1), self.create_entity(2)],
             landing_url=self.landing_url,
         )