WebsocketTest 1.0.11__tar.gz → 1.0.13__tar.gz

websockettest-1.0.13/MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include WebsocketTest/templates *
+recursive-include WebsocketTest/libs *

{websockettest-1.0.11 → websockettest-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.11
+Version: 1.0.13
 Summary: websocket api autotest
 Requires-Dist: allure_python_commons==2.13.5
 Requires-Dist: numpy==2.2.4

websockettest-1.0.13/WebsocketTest/allure_installer.py

@@ -0,0 +1,163 @@
+import os
+import sys
+import zipfile
+import subprocess
+import winreg
+from pathlib import Path
+
+# 配置参数
+ALLURE_VERSION = "2.30.0"
+PACKAGE_NAME = "WebsocketTest"  # 您的包名
+LOCAL_ZIP_RELATIVE_PATH = os.path.join("libs", f"allure-{ALLURE_VERSION}.zip")  # 包内相对路径
+INSTALL_DIR = os.path.expanduser("~/.allure")  # 安装到用户目录
+ALLURE_BIN_DIR = os.path.join(INSTALL_DIR, f"allure-{ALLURE_VERSION}", "bin")
+
+def is_allure_installed():
+    """检查Allure是否在PATH中且可执行"""
+    try:
+        # 同时检查版本避免找到无效安装
+        result = subprocess.run(["allure", "--version"], 
+                              check=True,
+                              stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE,
+                              text=True)
+        installed_version = result.stdout.strip()
+        if ALLURE_VERSION not in installed_version:
+            print(f"⚠️ 发现不匹配的Allure版本: {installed_version} (需要 {ALLURE_VERSION})")
+            return False
+        return True
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return False
+
+def get_local_zip_path():
+    """获取ZIP文件的绝对路径（兼容开发模式和正式安装）"""
+    # 尝试从包内获取
+    try:
+        import importlib.resources as pkg_resources
+        with pkg_resources.path(PACKAGE_NAME, LOCAL_ZIP_RELATIVE_PATH) as zip_path:
+            return str(zip_path)
+    except:
+        pass
+    
+    # 回退方案：从当前工作目录查找
+    base_dirs = [
+        os.getcwd(),
+        os.path.dirname(os.path.abspath(__file__)),
+        sys.prefix
+    ]
+    
+    for base in base_dirs:
+        zip_path = os.path.join(base, PACKAGE_NAME, LOCAL_ZIP_RELATIVE_PATH)
+        if os.path.exists(zip_path):
+            return zip_path
+    
+    raise FileNotFoundError(f"Allure ZIP文件未在任何位置找到: {LOCAL_ZIP_RELATIVE_PATH}")
+
+def install_allure():
+    """从本地ZIP安装Allure"""
+    try:
+        zip_path = get_local_zip_path()
+        print(f"🔍 找到Allure ZIP文件: {zip_path}")
+
+        # 创建安装目录
+        os.makedirs(INSTALL_DIR, exist_ok=True)
+        print(f"📦 解压到: {INSTALL_DIR}")
+
+        # 解压ZIP文件（使用更安全的提取方法）
+        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+            for file in zip_ref.namelist():
+                # 防止Zip Slip攻击
+                safe_path = os.path.join(INSTALL_DIR, *file.split('/'))
+                if file.endswith('/'):
+                    os.makedirs(safe_path, exist_ok=True)
+                else:
+                    with open(safe_path, 'wb') as f:
+                        f.write(zip_ref.read(file))
+
+        # 设置权限（特别是Linux/macOS）
+        if sys.platform != "win32":
+            os.chmod(os.path.join(ALLURE_BIN_DIR, "allure"), 0o755)
+
+        # 更新PATH
+        if add_to_user_path(ALLURE_BIN_DIR):
+            # 立即在当前进程生效
+            os.environ["PATH"] = f"{ALLURE_BIN_DIR}{os.pathsep}{os.environ.get('PATH', '')}"
+        
+        return True
+    except Exception as e:
+        print(f"❌ 安装失败: {type(e).__name__}: {e}", file=sys.stderr)
+        return False
+
+def add_to_user_path(path):
+    """添加到用户级PATH环境变量"""
+    try:
+        if sys.platform == "win32":
+            # Windows注册表操作
+            with winreg.OpenKey(
+                winreg.HKEY_CURRENT_USER,
+                r"Environment",
+                0,
+                winreg.KEY_READ | winreg.KEY_WRITE,
+            ) as key:
+                current_path, _ = winreg.QueryValueEx(key, "Path")
+                
+                if path in current_path.split(os.pathsep):
+                    return False
+                
+                new_path = f"{current_path}{os.pathsep}{path}" if current_path else path
+                winreg.SetValueEx(key, "Path", 0, winreg.REG_EXPAND_SZ, new_path)
+            
+            # 刷新环境变量
+            subprocess.run(
+                'powershell -command "[Environment]::SetEnvironmentVariable(\'Path\', $env:Path + \';{}\', \'User\')"'
+                .format(path),
+                shell=True,
+                check=True
+            )
+        else:
+            # Linux/macOS: 修改shell配置文件
+            shell_config = os.path.expanduser("~/.bashrc")
+            if not os.path.exists(shell_config):
+                shell_config = os.path.expanduser("~/.zshrc")
+            
+            with open(shell_config, "a") as f:
+                f.write(f"\nexport PATH=\"$PATH:{path}\"\n")
+        
+        print(f"✅ 已添加PATH: {path}")
+        return True
+    except Exception as e:
+        print(f"⚠️ 添加PATH失败: {e}\n请手动添加 {path} 到环境变量", file=sys.stderr)
+        return False
+
+def ensure_allure():
+    """确保Allure已安装"""
+    if is_allure_installed():
+        print(f"✅ Allure {ALLURE_VERSION} 已安装")
+        return True
+    
+    print("🔧 检测到Allure未安装，开始自动安装...")
+    if install_allure():
+        if not is_allure_installed():
+            print("""
+            \n⚠️ 安装成功但Allure仍未识别，可能是因为：
+            1. 需要重启终端使PATH生效
+            2. 尝试手动运行: {}
+            """.format(os.path.join(ALLURE_BIN_DIR, "allure" + (".bat" if sys.platform == "win32" else ""))))
+            return False
+        return True
+    else:
+        print(f"""
+        \n❌ 自动安装失败，请手动操作：
+        1. 解压 {get_local_zip_path()} 到任意目录（推荐 {INSTALL_DIR}）
+        2. 将解压后的bin目录添加到PATH:
+           - Windows: 添加 {ALLURE_BIN_DIR} 到系统环境变量
+           - Linux/macOS: 在~/.bashrc或~/.zshrc中添加:
+             export PATH="$PATH:{ALLURE_BIN_DIR}"
+        3. 运行 `allure --version` 验证
+        """)
+        return False
+
+if __name__ == "__main__":
+    if ensure_allure():
+        sys.exit(0)
+    sys.exit(1)

{websockettest-1.0.11 → websockettest-1.0.13}/WebsocketTest/run_tests.py

@@ -1,7 +1,7 @@
 import subprocess
 import argparse
 import shutil
-import time
+import time,platform
 import webbrowser
 from urllib.request import urlopen
 from urllib.error import URLError
@@ -93,19 +93,6 @@ class TestRunner:
             logger.error(f"Tests failed with exit code {e.returncode}")
         except subprocess.TimeoutExpired:
             logger.error("Test execution timed out after 1 hour")
-
-    def generate_allure_report(self) -> bool:
-        """生成Allure报告"""
-        try:
-            cmd = [self.allure_manager.allure_path, "generate", self.allure_results, "-o", self.args.report_dir, "--clean"]
-            subprocess.run(
-                cmd,
-                check=True,
-                timeout=300
-            )
-            # logger.info(f"generate_allure_report Executing: {' '.join(cmd)}")
-        except subprocess.CalledProcessError as e:
-            logger.error(f"Report generation failed: {e}")
     def _handle_allure_report(self) -> bool:
         """Handle Allure report serving and browser opening."""
         if  self.allure_manager.is_server_running():

{websockettest-1.0.11 → websockettest-1.0.13}/WebsocketTest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.11
+Version: 1.0.13
 Summary: websocket api autotest
 Requires-Dist: allure_python_commons==2.13.5
 Requires-Dist: numpy==2.2.4

{websockettest-1.0.11 → websockettest-1.0.13}/WebsocketTest.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 setup.cfg
 setup.py
 WebsocketTest/__init__.py
+WebsocketTest/allure_installer.py
 WebsocketTest/cli.py
 WebsocketTest/conftest.py
 WebsocketTest/run_tests.py
@@ -24,6 +25,7 @@ WebsocketTest/common/__init__.py
 WebsocketTest/common/assertUtils.py
 WebsocketTest/common/logger.py
 WebsocketTest/common/utils.py
+WebsocketTest/libs/allure-2.30.0.zip
 WebsocketTest/templates/basic/conftest.py
 WebsocketTest/templates/basic/pytest.ini
 WebsocketTest/templates/basic/config/svw/live.yml

{websockettest-1.0.11 → websockettest-1.0.13}/setup.py

@@ -1,7 +1,8 @@
-from setuptools import find_packages, setup
+from setuptools import find_packages, setup,sys
 from setuptools.command.sdist import sdist
 from setuptools.command.bdist_wheel import bdist_wheel
-
+# 自定义安装命令
+from setuptools.command.install import install
 class CustomSdist(sdist):
     def initialize_options(self):
         super().initialize_options()
@@ -11,14 +12,25 @@ class CustomBdistWheel(bdist_wheel):
     def initialize_options(self):
         super().initialize_options()
         self.dist_dir = "setup_temp/dist"
-
+class PostInstallCommand(install):
+    def run(self):
+        install.run(self)
+        check_and_install_allure()
+# Allure检查安装逻辑（独立模块）
+def check_and_install_allure():
+    try:
+        from WebsocketTest.allure_installer import ensure_allure
+        ensure_allure()
+    except Exception as e:
+        print(f"⚠️ Allure安装失败: {e}", file=sys.stderr)
 setup(
     cmdclass={
+        'install': PostInstallCommand,
         'sdist': CustomSdist,
         'bdist_wheel': CustomBdistWheel
     },
     name="WebsocketTest",
-    version="1.0.11",
+    version="1.0.13",
     packages=find_packages(exclude=[
         "WebsocketTest.allure_report", 
         "WebsocketTest.logs", 

websockettest-1.0.11/MANIFEST.in

@@ -1 +0,0 @@
-recursive-include WebsocketTest/templates *