fix: Better timeout handling and memory setting fix

Author: Alan Christie

src/jote/compose.py

@@ -257,6 +257,7 @@ def run(
         cwd = os.getcwd()
         os.chdir(execution_directory)
 
+        timeout: bool = False
         try:
             # Run the container, and then cleanup.
             # If a test environment is set then we pass in these values to the
@@ -293,12 +294,23 @@ def run(
                 timeout=240,
                 check=False,
             )
+        except:  # pylint: disable=bare-except
+            timeout = True
         finally:
             os.chdir(cwd)
 
-        print(f"# Compose: Executed (exit code {test.returncode})")
-
-        return test.returncode, test.stdout.decode("utf-8"), test.stderr.decode("utf-8")
+        if timeout:
+            print("# Compose: ERROR - Test timeout")
+            return_code: int = -911
+            test_stdout: str = ""
+            test_stderr: str = ""
+        else:
+            print(f"# Compose: Executed (exit code {test.returncode})")
+            return_code = test.returncode
+            test_stdout = test.stdout.decode("utf-8")
+            test_stderr = test.stderr.decode("utf-8")
+
+        return return_code, test_stdout, test_stderr
 
     def delete(self) -> None:
         """Deletes a test directory created by 'create()'."""

src/jote/jote.py

@@ -768,7 +768,10 @@ def _run_a_test(
         job_image = f"{job_definition.image.name}:{job_definition.image.tag}"
     job_image_memory: str = job_definition.image["memory"]
     if job_image_memory is None:
-        job_image_memory = "1Gi"
+        job_image_memory = "1G"
+    elif job_image_memory.lower().endswith("i"):
+        # Strip trailing kubernetes 'i' - not liked by compose
+        job_image_memory = job_image_memory[:-1]
     job_image_cores: int = job_definition.image["cores"]
     if job_image_cores is None:
         job_image_cores = 1