From ac006dcc7f8e7d52ffa743bbd284ef8dc6728d69 Mon Sep 17 00:00:00 2001
From: "bodong.ybd" <bodong.ybd@alibaba-inc.com>
Date: Fri, 6 Dec 2024 13:59:32 +0800
Subject: [PATCH] chore: refactor conn.py

---
 Terraform/Aliyun/main.tf |   1 -
 conn.py                  | 123 ++++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Terraform/Aliyun/main.tf b/Terraform/Aliyun/main.tf
index 787a6c6..9494d41 100644
--- a/Terraform/Aliyun/main.tf
+++ b/Terraform/Aliyun/main.tf
@@ -326,7 +326,6 @@ if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
 fi
 
 cd resp-compatibility
-git checkout dailyTest
 python3 conn.py
 EOF
 }
diff --git a/conn.py b/conn.py
index b35907f..3531bd2 100644
--- a/conn.py
+++ b/conn.py
@@ -1,39 +1,36 @@
-import os
 import threading
 import time
 import yaml
 import subprocess
 
-# 更新配置文件
-try:
+def update_config():
     yml_file_path = '/root/db_config.yml'
     config_file_path = 'config.yaml'
 
-    with open(yml_file_path, 'r') as yml_file, open(config_file_path, 'r') as config_file:
-        yml_data = yaml.safe_load(yml_file)
-        config_data = yaml.safe_load(config_file)
+    try:
+        with open(yml_file_path, 'r') as yml_file, open(config_file_path, 'r') as config_file:
+            yml_data = yaml.safe_load(yml_file)
+            config_data = yaml.safe_load(config_file)
 
-        for db_name, db_config in yml_data.items():
-            if db_name in config_data['Database']:
-                for key, value in db_config.items():
-                    config_data['Database'][db_name][key] = value
-            else:
-                config_data['Database'][db_name] = db_config
+            for db_name, db_config in yml_data.items():
+                if db_name in config_data['Database']:
+                    for key, value in db_config.items():
+                        config_data['Database'][db_name][key] = value
+                else:
+                    config_data['Database'][db_name] = db_config
 
-    with open(config_file_path, 'w') as config_file:
-        yaml.dump(config_data, config_file, default_flow_style=False)
+        with open(config_file_path, 'w') as config_file:
+            yaml.dump(config_data, config_file, default_flow_style=False)
 
-    print("Config file updated successfully.")
+        print("Config file updated successfully.")
 
-except FileNotFoundError as e:
-    print(f"Error: {e}. Please check the file paths.")
-except yaml.YAMLError as e:
-    print(f"Error in YAML processing: {e}")
-except Exception as e:
-    print(f"An unexpected error occurred: {e}")
+    except FileNotFoundError as e:
+        print(f"Error: {e}. Please check the file paths.")
+    except yaml.YAMLError as e:
+        print(f"Error in YAML processing: {e}")
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}")
 
-
-# 执行命令并判断是否成功
 def execute_command(commands):
     for command in commands:
         result = subprocess.run(command, shell=True, capture_output=True, text=True)
@@ -44,50 +41,32 @@ def execute_command(commands):
             print(f"Successfully executed command '{command}': {result.stdout}")
     return True
 
+def run_tests():
+    run_test_command = [
+        "pip3 install -r requirements.txt",
+        "python3 resp_compatibility.py --testfile cts.json --genhtml --show-failed",
+    ]
 
-
-commands = [
-    "apt-get update",
-    "apt-get install -y python3-pip",
-]
-if not execute_command(commands):
-    print("Failed to update or install packages. Exiting...")
-    exit(1)
-
-# 运行测试命令
-run_test_command = [
-    "pip3 install -r requirements.txt",
-    "python3 resp_compatibility.py --testfile cts.json --genhtml --show-failed",
-]
-
-def run_test():
     if not execute_command(run_test_command):
         print("Test failed. Exiting...")
         exit(1)
     else:
         print("Test completed successfully.")
 
-# 启动测试脚本的线程
-test_thread = threading.Thread(target=run_test)
-test_thread.start()
-
-time.sleep(300)
-
-# 提交和推送测试结果
-commit_and_push_commands = [
-    "mv html /root",
-    "git stash -u",
-    "git checkout gh-pages || git checkout -b gh-pages",
-    "git pull origin gh-pages",
-    "cp -r /root/html/* .", 
-    "git add .",
-    "git commit -m 'Update test results'",
-]
-if not execute_command(commit_and_push_commands):
-    print("Failed to commit and push changes. Exiting...")
-    exit(1)
-
-# 推送到 GitHub 并重试
+def commit_and_push_results():
+    commit_and_push_commands = [
+        "mv html /root",
+        "git stash -u",
+        "git checkout gh-pages || git checkout -b gh-pages",
+        "git pull origin gh-pages",
+        "cp -r /root/html/* .",
+        "git add .",
+        "git commit -m 'Update test results'",
+    ]
+    if not execute_command(commit_and_push_commands):
+        print("Failed to commit and push changes. Exiting...")
+        exit(1)
+
 def git_push_with_retry():
     while True:
         result = subprocess.run("git push -u origin gh-pages", shell=True, capture_output=True, text=True)
@@ -98,5 +77,27 @@ def git_push_with_retry():
             print(f"Git push failed: {result.stderr}. Retrying in 5 seconds...")
             time.sleep(5)
 
-git_push_with_retry()
+def main():
+    update_config()
+
+    package_update_commands = [
+        "apt-get update",
+        "apt-get install -y python3-pip",
+    ]
+    if not execute_command(package_update_commands):
+        print("Failed to update or install packages. Exiting...")
+        exit(1)
+
+    test_thread = threading.Thread(target=run_tests)
+    test_thread.start()
+    test_thread.join(timeout=300)
+
+    if test_thread.is_alive():
+        print("Test timed out. Exiting...")
+        exit(1)
+
+    commit_and_push_results()
+    git_push_with_retry()
 
+if __name__ == "__main__":
+    main()