From 1b10f0ff7695715f1b259f1d35d5aaedfc9fecd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Sun, 28 Jan 2024 23:22:00 +0100
Subject: [PATCH] Fix parse_tests_toml, oopsie on pathlib, and in the calling
 bash script

---
 lib/parse_tests_toml.py   | 6 +++---
 lib/tests_coordination.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/parse_tests_toml.py b/lib/parse_tests_toml.py
index 8522a63..50c28f6 100644
--- a/lib/parse_tests_toml.py
+++ b/lib/parse_tests_toml.py
@@ -99,7 +99,7 @@ def filter_test_list(test_manifest, base_test_list):
         yield test_suite_id, tests_for_this_suite
 
 
-def dump_for_package_check(test_list, package_check_tests_dir):
+def dump_for_package_check(test_list: dict[str, dict[str, Any]], package_check_tests_dir: Path) -> None:
 
     test_suite_i = 0
 
@@ -133,7 +133,7 @@ def dump_for_package_check(test_list, package_check_tests_dir):
 
             test_file_id = test_suite_i * 100 + subtest_i
 
-            json.dump(J, open(package_check_tests_dir + f"/{test_file_id}.json", "w"))
+            json.dump(J, (package_check_tests_dir / f"{test_file_id}.json").open("w"))
 
 
 def build_test_list(basedir: Path) -> dict[str, dict[str, Any]]:
@@ -143,7 +143,7 @@ def build_test_list(basedir: Path) -> dict[str, dict[str, Any]]:
         manifest = json.load((basedir / "manifest.json").open("r"))
         is_multi_instance = manifest.get("multi_instance") is True
     else:
-        manifest = json.load((basedir / "manifest.toml").open("r"))
+        manifest = toml.load((basedir / "manifest.toml").open("r"))
         is_multi_instance = manifest.get("integration").get("multi_instance") is True
 
     is_webapp = os.system(f"grep -q '^ynh_add_nginx_config' '{str(basedir)}/scripts/install'") == 0
diff --git a/lib/tests_coordination.sh b/lib/tests_coordination.sh
index f0819d8..3facb04 100644
--- a/lib/tests_coordination.sh
+++ b/lib/tests_coordination.sh
@@ -37,7 +37,7 @@ run_all_tests() {
     tests_toml="$package_path/tests.toml"
     if [ -e "$tests_toml" ]
     then
-        DIST=$DIST python3 "./lib/parse_tests_toml.py" "$package_path" "$TEST_CONTEXT/tests"
+        DIST=$DIST "./lib/parse_tests_toml.py" "$package_path" --dump-to "$TEST_CONTEXT/tests"
     else
         # Parse the check_process only if it's exist
         check_process="$package_path/check_process"