test changes

Author: petrucci89

Makefile

@@ -38,7 +38,7 @@ test_integration:
 		--maxfail=10 \
 		--log-level=INFO \
 		tests/integration \
-		-k 'loki' \
+		-k 'test_s3_merged_log_reader' \
 	    -n 12
 
 

platform_monitoring/loki_client.py

@@ -93,8 +93,8 @@ async def query_range(self, **params: Any) -> dict[str, Any]:
         )
 
         result["data"]["result"] = data_result
-        log = f"{params=} {result=}"
-        logger.info(log)
+        # log = f"{params=} {result=}"
+        # logger.info(log)
         return result
 
     async def query_range_page_iterate(
@@ -113,10 +113,10 @@ async def query_range_page_iterate(
             yield response
 
             # remove
-            logger.info(
-                "Total entries returned: %s",
-                response["data"]["stats"]["summary"]["totalEntriesReturned"],
-            )
+            # logger.debug(
+            #     "Total entries returned: %s",
+            #     response["data"]["stats"]["summary"]["totalEntriesReturned"],
+            # )
 
             if response["data"]["stats"]["summary"]["totalEntriesReturned"] < limit:
                 break
@@ -127,4 +127,4 @@ async def query_range_page_iterate(
                 end = int(response["data"]["result"][-1][0]) - 1
 
             # remove
-            logger.info("%s", f"{start=} {end=}")
+            # logger.debug("%s", f"{start=} {end=}")

tests/integration/test_kube.py

@@ -660,7 +660,6 @@ async def _consume_log_reader(
             async with log_reader as it:
                 async for chunk in it:
                     buffer += chunk
-                    logger.info("Buffer: %s", buffer)
                     if delay:
                         await asyncio.sleep(delay)
         except asyncio.CancelledError:
@@ -1319,7 +1318,8 @@ async def coro() -> bytes | Exception:
 
         # Output for debugging
         for i, (name, payload) in enumerate(zip(names, payloads, strict=False)):
-            print(f"{i}. {name}: {payload!r}")  # noqa: T201
+            print(f"111111111 {i}. {name}: {payload!r}")  # noqa: T201
+            logger.info("222222222 %s: %r", name, payload)
 
         expected_payload = "".join(f"{i}\n" for i in range(1, 6)).encode()
         # All logs are completely either live or archive, no separator.

tests/k8s/cluster.sh

@@ -52,7 +52,7 @@ function k8s::apply_all_configurations {
 
 function k8s::wait_for_all_pods_running {
 
-    kubectl wait --for=condition=ready deployment/loki-read  --timeout=300s
+    kubectl wait --for=condition=ready deployment/loki-read  --timeout=200s
     return 0
 
 #    local timeout=180