Tidy up slow test scripts (#2684)

### What problem does this PR solve?

Tidy up slow test scripts

Issue link:#[Link the issue here]

### Type of change

- [x] Refactoring

Author: yuzhichang

conf/new_pytest_parallel_infinity_conf.toml

@@ -0,0 +1,4 @@
+[pytest]
+markers =
+    slow: Mark a test as slow-running, e.g., for tests that take longer to execute.
+    complex: Mark a test as complex.

pytest.ini

@@ -1,14 +1,11 @@
-from abc import abstractmethod
 import logging
 import os
 import subprocess
-import os
 import psutil
 import time
 import infinity
-from infinity.common import ConflictType, InfinityException
+from infinity.common import InfinityException
 from infinity.errors import ErrorCode
-from util import *
 
 PYTEST_LOG_FILE = "restart_test.py.log"
 
@@ -18,10 +15,6 @@ def __init__(self, infinity_path: str, config_path: str, *, logger=None):
         self.data_dir = "/var/infinity"
         self.default_config_path = config_path
 
-        self.use_new_catalog = False
-        if "new" in self.default_config_path:
-            self.use_new_catalog = True
-
         self.script_path = "./scripts/timeout_kill.sh"
         self.infinity_path = infinity_path
 
@@ -52,17 +45,15 @@ def clear(self):
         os.system(
             f"rm -rf {self.data_dir}/catalog {self.data_dir}/data {self.data_dir}/log {self.data_dir}/persistence {self.data_dir}/tmp {self.data_dir}/wal"
         )
-        os.system(f"rm -rf restart_test.log.*")
+        os.system("rm -rf restart_test.log.*")
         os.system(f"rm -rf {PYTEST_LOG_FILE}")
         print(f"clear {self.data_dir}")
         self.i = 0
 
     def init(self, config_path: str | None = None):
-        init_timeout = 60
+        # init_timeout = 60
         if config_path is None:
             config_path = self.default_config_path
-        elif self.use_new_catalog:
-            config_path = make_new_config(config_path)
 
         cmd = f"{self.infinity_path} --config={config_path} > restart_test.log.{self.i} 2>&1"
 

python/restart_test/infinity_runner.py

@@ -1,4 +1,3 @@
-import os
 import threading
 
 
@@ -22,35 +21,3 @@ def join(self, *args):
         if self.exception_:
             raise self.exception_
         return self._rtn
-
-# open toml file and 
-# add "use_new_catalog = true" under [storage]
-def make_new_config(filepath: str):
-    file_dir, filename = filepath.rsplit("/", 1)
-    new_filename = filename.split(".")[0] + "_new.toml"
-    new_filepath = file_dir + "/" + new_filename
-
-    if os.path.exists(new_filepath):
-        return new_filepath
-
-    with open(filepath, "r") as f:
-        lines = f.readlines()
-    with open(new_filepath, "w") as f:
-        for line in lines:
-            if line.startswith("[storage]"):
-                f.write(line)
-                f.write("use_new_catalog = true\n")
-            else:
-                f.write(line)
-    return new_filepath
-
-# remove the new config file
-def remove_new_config(filepath: str):
-    file_dir, filename = filepath.rsplit("/", 1)
-    new_filename = filename.split(".")[0] + "_new.toml"
-    new_filepath = file_dir + "/" + new_filename
-    try:
-        os.remove(new_filepath)
-    except Exception as e:
-        print(f"remove {new_filepath} failed: {e}")
-    return new_filepath

python/restart_test/util.py

@@ -42,6 +42,7 @@
         "-m",
         "pytest",
         "-v",
+        "--tb=short",
         test_case,
         f"--infinity_path={infinity_path}",
         "-x",

tools/run_cluster_test.py

@@ -54,6 +54,7 @@
                     "-m",
                     "pytest",
                     "-v",
+                    "--tb=short",
                     test_case,
                     f"--infinity_path={infinity_path}",
                     "-x",
@@ -73,6 +74,7 @@
                     "-m",
                     "pytest",
                     "-v",
+                    "--tb=short",
                     test_case,
                     f"--infinity_path={infinity_path}",
                     "-x",