[Tests] Fix windows tests and add timeout management

Author: Guillaume De Saint Martin

dev_requirements.txt

@@ -1,2 +1,3 @@
 pytest
+pytest-timeout
 requests

tests/__init__.py

@@ -24,7 +24,7 @@ def is_on_windows():
 
 def get_binary_file_path() -> str:
     if is_on_windows():
-        return "OctoBot_windows_x64.exe/OctoBot_windows.exe"
+        return "OctoBot_windows_x64.exe\\OctoBot_windows.exe"
     elif platform.system() == "Darwin":
         return "./OctoBot_macos_x64/OctoBot_macos-latest_x64"
     else:

tests/test_binary.py

@@ -30,6 +30,7 @@
 
 BINARY_DISABLE_WEB_OPTION = "-nw"
 LOG_CHECKS_MAX_ATTEMPTS = 300
+DEFAULT_TIMEOUT_WINDOW = -95
 
 
 @pytest.fixture
@@ -61,27 +62,29 @@ def start_binary_without_web_app():
 
 def start_binary_process(binary_options, output_file, err_file):
     logger.debug("Starting binary process...")
-    return subprocess.Popen(f"{get_binary_file_path()} {binary_options}",
+    return subprocess.Popen(f"{get_binary_file_path()}{f' {binary_options}' if binary_options else ''}",
                             shell=True,
                             stdout=output_file,
                             stderr=err_file,
                             preexec_fn=os.setsid if not is_on_windows() else None)
 
 
 def terminate_binary(binary_process, output_file, err_file):
-    logger.info(output_file.read())
-    errors = err_file.read()
-    if errors:
-        logger.error(errors)
-        raise ValueError(f"Error happened during process execution : {errors}")
-    logger.debug("Killing binary process...")
-    if is_on_windows():
-        os.kill(binary_process.pid, signal.CTRL_C_EVENT)
-    else:
-        try:
-            os.killpg(os.getpgid(binary_process.pid), signal.SIGTERM)  # Send the signal to all the process groups
-        except ProcessLookupError:
-            binary_process.kill()
+    try:
+        logger.info(output_file.read())
+        errors = err_file.read()
+        if errors:
+            logger.error(errors)
+            raise ValueError(f"Error happened during process execution : {errors}")
+    finally:
+        logger.debug("Killing binary process...")
+        if is_on_windows():
+            subprocess.call(["taskkill", "/F", "/IM", "OctoBot_windows.exe"])
+        else:
+            try:
+                os.killpg(os.getpgid(binary_process.pid), signal.SIGTERM)  # Send the signal to all the process groups
+            except ProcessLookupError:
+                binary_process.kill()
 
 
 def multiple_checks(check_method, sleep_time=1, max_attempts=10, **kwargs):
@@ -120,26 +123,30 @@ def check_logs_content(expected_content: str, should_appear: bool = True):
     return expected_content not in log_content
 
 
+@pytest.mark.timeout(100 + DEFAULT_TIMEOUT_WINDOW)
 def test_terms_endpoint(start_binary):
     multiple_checks(check_endpoint,
                     max_attempts=100,
                     endpoint_url="http://localhost:5001/terms",
                     expected_code=200)
 
 
+@pytest.mark.timeout(LOG_CHECKS_MAX_ATTEMPTS + DEFAULT_TIMEOUT_WINDOW)
 def test_evaluation_state_created(start_binary_without_web_app):
     multiple_checks(check_logs_content,
                     max_attempts=LOG_CHECKS_MAX_ATTEMPTS,
                     expected_content="new state:")
 
 
+@pytest.mark.timeout(LOG_CHECKS_MAX_ATTEMPTS + DEFAULT_TIMEOUT_WINDOW)
 def test_logs_content_has_no_errors(start_binary_without_web_app):
     multiple_checks(check_logs_content,
                     max_attempts=LOG_CHECKS_MAX_ATTEMPTS,
                     expected_content="ERROR",
                     should_appear=False)
 
 
+@pytest.mark.timeout(LOG_CHECKS_MAX_ATTEMPTS + DEFAULT_TIMEOUT_WINDOW)
 def test_balance_profitability_updated(start_binary_without_web_app):
     multiple_checks(check_logs_content,
                     max_attempts=LOG_CHECKS_MAX_ATTEMPTS,