Merge branch 'edge' into analyses-cli

Author: y3rsh

abr-testing/abr_testing/tools/test_modules.py

@@ -16,8 +16,8 @@
 async def tc_test_1(module: str, path_to_file: str) -> None:
     """Thermocycler Test 1 Open and Close Lid."""
     duration = int(input("How long to run this test for? (in seconds): "))
-    start = time.time()
-    while time.time() - start < duration:
+    start = time.monotonic()
+    while time.monotonic() - start < duration:
         try:
             await (tc_open_lid(module, path_to_file))
         except asyncio.TimeoutError:
@@ -34,8 +34,8 @@ async def hs_test_1(module: str, path_to_file: str) -> None:
     """Heater Shaker Test 1. (Home and Shake)."""
     duration = int(input("How long to run this test for? (in seconds): "))
     rpm = input("Target RPM (200-3000): ")
-    start = time.time()
-    while time.time() - start < duration:
+    start = time.monotonic()
+    while time.monotonic() - start < duration:
         try:
             await (hs_test_home(module, path_to_file))
         except asyncio.TimeoutError:

analyses-snapshot-testing/citools/generate_analyses.py

@@ -125,8 +125,8 @@ def start_containers(image_name: str, num_containers: int, timeout: int = 60) ->
         containers.append(container)
 
     # Wait for containers to be ready
-    start_time = time.time()
-    while time.time() - start_time < timeout:
+    start_time = time.monotonic()
+    while time.monotonic() - start_time < timeout:
         all_ready = True
         for container in containers:
             exit_code, _ = container.exec_run(f"ls -al {CONTAINER_LABWARE}")
@@ -172,7 +172,7 @@ def analyze(protocol: TargetProtocol, container: docker.models.containers.Contai
     # Build the command with all relevant file paths
     all_files = [str(protocol.container_protocol_file)] + [str(lw) for lw in labware_files]
     command = f"python -I -m opentrons.cli analyze --json-output {protocol.container_analysis_file} " + " ".join(all_files)
-    start_time = time.time()
+    start_time = time.monotonic()
     result = None
     exit_code = None
     console.print(f"Beginning analysis of {protocol.host_protocol_file.name}")
@@ -191,7 +191,7 @@ def analyze(protocol: TargetProtocol, container: docker.models.containers.Contai
         protocol.set_analysis()
         return False
     finally:
-        protocol.set_analysis_execution_time(time.time() - start_time)
+        protocol.set_analysis_execution_time(time.monotonic() - start_time)
         console.print(f"Analysis of {protocol.host_protocol_file.name} completed in {protocol.analysis_execution_time:.2f} seconds.")
 
 
@@ -238,7 +238,7 @@ def get_container_instances(protocol_len: int) -> int:
 
 def generate_analyses_from_test(tag: str, protocols: List[Protocol]) -> List[TargetProtocol]:
     """Generate analyses from the tests."""
-    start_time = time.time()
+    start_time = time.monotonic()
     protocols_to_process: List[TargetProtocol] = []
     for test_protocol in protocols:
         host_protocol_file = Path(test_protocol.file_path)
@@ -256,6 +256,6 @@ def generate_analyses_from_test(tag: str, protocols: List[Protocol]) -> List[Tar
         )
     instance_count = get_container_instances(len(protocols_to_process))
     analyze_against_image(tag, protocols_to_process, instance_count)
-    end_time = time.time()
+    end_time = time.monotonic()
     console.print(f"Clock time to generate analyses: {end_time - start_time:.2f} seconds.")
     return protocols_to_process