WebsocketTest 1.0.15__py3-none-any.whl → 1.0.17__py3-none-any.whl

WebsocketTest/allure_installer.py

@@ -4,6 +4,7 @@ import zipfile
 import subprocess
 import winreg
 from pathlib import Path
+import shutil
 
 # 配置参数
 ALLURE_VERSION = "2.30.0"
@@ -13,43 +14,71 @@ 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中且可执行"""
+    """检查Allure是否在PATH中且版本匹配
+    Returns:
+        Tuple[bool, str]: (是否安装正确, 版本信息或错误消息)
+    """
+    # 1. 首先检查allure命令是否存在
+    allure_cmd = "allure"
+    if not shutil.which(allure_cmd):
+        return False
+    
+    # 2. 获取版本信息
     try:
-        # 同时检查版本避免找到无效安装
-        result = subprocess.run(["allure", "--version"], 
-                              check=True,
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE,
-                              text=True)
+        result = subprocess.run(
+            [allure_cmd, "--version"],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            encoding="utf-8",
+            timeout=5  # 添加超时防止卡住
+        )
         installed_version = result.stdout.strip()
+        
+        # 3. 验证版本
         if ALLURE_VERSION not in installed_version:
-            print(f"⚠️ 发现不匹配的Allure版本: {installed_version} (需要 {ALLURE_VERSION})")
+            print(f"Allure版本不匹配: 已安装 {installed_version} (需要 {ALLURE_VERSION})")
             return False
+        
         return True
-    except (subprocess.CalledProcessError, FileNotFoundError):
-        return False
+        
+    except subprocess.CalledProcessError as e:
+        return False, f"Allure版本检查失败: {e.stderr}"
+    except Exception as e:
+        return False, f"检查Allure时发生意外错误: {str(e)}"
 
 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:
+        from importlib.resources import files
+        # Python 3.9+ 标准方式
+        resource = files(PACKAGE_NAME).joinpath(LOCAL_ZIP_RELATIVE_PATH)
+        if Path(str(resource)).exists():
+            return str(resource)
+    except Exception as e:
         pass
-    
-    # 回退方案：从当前工作目录查找
-    base_dirs = [
-        os.getcwd(),
-        os.path.dirname(os.path.abspath(__file__)),
-        sys.prefix
+
+    # 备选搜索路径（按优先级排序）
+    search_paths = [
+        # 1. 当前脚本所在目录的子目录（开发模式）
+        Path(__file__).parent / LOCAL_ZIP_RELATIVE_PATH,
+        
+        # # 2. 当前工作目录的包子目录
+        Path.cwd() / PACKAGE_NAME / LOCAL_ZIP_RELATIVE_PATH,
+        
+        # # 3. Python安装目录下的包子目录
+        Path(sys.prefix) /"Lib/site-packages" / PACKAGE_NAME / LOCAL_ZIP_RELATIVE_PATH,
+        
+        # # 4. 直接尝试相对路径（适用于打包后的exe等情况）
+        # Path(LOCAL_ZIP_RELATIVE_PATH)
     ]
-    
-    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
+    # 回退方案：从当前工作目录查找
+
+    for _path in search_paths:
+        if os.path.exists(_path):
+            return _path
     
     raise FileNotFoundError(f"Allure ZIP文件未在任何位置找到: {LOCAL_ZIP_RELATIVE_PATH}")
 
@@ -75,13 +104,13 @@ def install_allure():
                         f.write(zip_ref.read(file))
 
         # 设置权限（特别是Linux/macOS）
-        if sys.platform != "win32":
-            os.chmod(os.path.join(ALLURE_BIN_DIR, "allure"), 0o755)
+        # 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', '')}"
+        # 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:
@@ -114,17 +143,8 @@ def add_to_user_path(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
+            print(f"✅ 已添加PATH: {path}")
+            return True
     except Exception as e:
         print(f"⚠️ 添加PATH失败: {e}\n请手动添加 {path} 到环境变量", file=sys.stderr)
         return False
@@ -144,6 +164,7 @@ def ensure_allure():
             2. 尝试手动运行: {}
             """.format(os.path.join(ALLURE_BIN_DIR, "allure" + (".bat" if sys.platform == "win32" else ""))))
             return False
+        print(f"✅ Allure {ALLURE_VERSION} 安装安装成功")
         return True
     else:
         print(f"""

WebsocketTest/common/WSBaseApi.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from WebsocketTest.common.Assertion import Assert
 import pytest
 import traceback
+from WebsocketTest.conftest import SHEET_NAME
 class WSBaseApi:
     def __init__(self, **kwargs):
         self.request = {}
@@ -29,11 +30,11 @@ class WSBaseApi:
         asyncio.run(self.WebSocketApi())
 
 
-
 class BaseApiTest:
     # 定义需要子类实现的属性
     TEST_TYPE = "API自动化测试"  # 默认值，可被子类覆盖
     CASE_PATH = Path.cwd().resolve().joinpath("data/case_data.xlsx")
+    
 
     @cached_property
     def API_TEST_RUNNER_CLASS(self):
@@ -51,7 +52,7 @@ class BaseApiTest:
             ) from e
     
 
-    @pytest.mark.parametrize('case_suite', gen_case_suite(CASE_PATH))
+    @pytest.mark.parametrize('case_suite', gen_case_suite(CASE_PATH,sheet_name=SHEET_NAME))
     def test(self, case_suite, setup_env):
         """测试用例执行模板"""
         try:
@@ -70,7 +71,7 @@ class BaseApiTest:
             
         except Exception as e:
             self._record_error(e)
-            raise
+            pytest.fail(f"Case failed: {str(e)}")
     
     def _record_allure_report(self, runner):
         """记录Allure测试报告"""

WebsocketTest/common/test.py

@@ -0,0 +1,36 @@
+import websockets
+from functools import cached_property
+import asyncio
+from WebsocketTest.common.utils import *
+import allure
+from pathlib import Path
+from WebsocketTest.common.Assertion import Assert
+import pytest
+import traceback
+
+
+CASE_PATH = Path.cwd().resolve().joinpath("data/case_data.xlsx")
+@pytest.fixture
+def sheet_name(request):
+    """动态获取 sheet_name"""
+    service = request.config.getoption("--service")
+    project = request.config.getoption("--project")
+    return f"{project}_{service}"
+
+@pytest.fixture
+def case_suite(sheet_name):
+    """生成测试数据"""
+    return gen_case_suite(CASE_PATH, sheet_name)
+
+class BaseApiTest:
+    def test(self, case_suite, setup_env):
+        """测试用例执行模板"""
+        try:
+            params = merge_dicts(case_suite, setup_env)
+            runner = self.API_TEST_RUNNER_CLASS(**params)
+            runner.run()
+            self._record_allure_report(runner)
+            self._execute_assertions(runner, case_suite)
+        except Exception as e:
+            self._record_error(e)
+            raise

WebsocketTest/common/utils.py

@@ -189,8 +189,8 @@ def append_msg_to_excel(file_path, **kwargs):
         current_function = inspect.currentframe().f_code.co_name
         print(f"An error occurred in file '{current_file}' and function '{current_function}': {e}")
 
-def read_excel(file_path):
-    df = pd.read_excel(file_path, header=0, dtype={'debug': str,'debugX': str})
+def read_excel(file_path,sheet_name):
+    df = pd.read_excel(file_path,sheet_name, header=0, dtype={'debug': str,'debugX': str})
     # 如果确实需要空字符串，先转换类型
     pd.set_option('future.no_silent_downcasting', True)
     df = df.astype(object).fillna("")  # 转换为object类型
@@ -234,9 +234,9 @@ def merge_dicts(a: dict, b: dict) -> dict:
         for k in set(a) | set(b)
     }
 
-def gen_case_suite(file_path):
+def gen_case_suite(file_path,sheet_name):
     # 生成测试用例套件
-    data_dict = read_excel(file_path)
+    data_dict = read_excel(file_path,sheet_name)
     case_suite = []
     for case in data_dict:
         case_suite.append(case)

WebsocketTest/conftest.py

@@ -2,6 +2,9 @@ import pytest
 import yaml
 from pathlib import Path
 
+SHEET_NAME = "0"  # 默认值
+
+
 # 设置环境信息的 fixture
 @pytest.fixture(scope="session")
 def setup_env(request):
@@ -30,7 +33,6 @@ def setup_env(request):
             'service': service,
             'project': project})
     return environments
-
 # 添加命令行选项
 def pytest_addoption(parser):
     parser.addoption(
@@ -56,4 +58,12 @@ def pytest_addoption(parser):
         action="store",
         default="vwa",
         help="Project name is required"
-    )
+    )
+
+def pytest_configure(config):
+    project = config.getoption("--project")
+    service = config.getoption("--service")
+    """在测试初始化阶段解析参数并全局缓存"""
+    global SHEET_NAME
+    SHEET_NAME = f"{project}-{service}"
+    

WebsocketTest/run_tests.py

@@ -35,7 +35,7 @@ class AllureManager:
                 start_new_session=True
             )
             
-            time.sleep(3)  # 等待服务启动
+            time.sleep(1)  # 等待服务启动
             return True
         except Exception as e:
             logger.error(f"Failed to start Allure server: {e}")
@@ -81,11 +81,11 @@ class TestRunner:
             "--service", self.args.service,
             "--project", self.args.project,
             "--alluredir", self.allure_results
+            ,"testcase\\test_all.py"
         ]
            # 添加可选测试路径（如果存在）
         if hasattr(self.args, 'testcase') and self.args.testcase:
-            cmd.insert(1, self.args.testcase)
-        print(f"run_pytest_tests Executing: {' '.join(cmd)}")
+            cmd.insert(1, self.args.testcase) 
         try:
             # logger.info(f"run_pytest_tests Executing: {' '.join(cmd)}")
             subprocess.run(cmd, check=True, timeout=3600)
@@ -115,8 +115,7 @@ class TestRunner:
                 webbrowser.open(f"http://localhost:{self.args.port}")
         else:
             logger.info("Starting new Allure server...")
-            if self.allure_manager.start_server(self.args.report_dir):
-                webbrowser.open(f"http://localhost:{self.args.port}")
+            self.allure_manager.start_server(self.args.report_dir)
     def run(self):
         # 1. 运行测试
         self.run_pytest_tests()

WebsocketTest/templates/basic//321/206/320/231/320/267/321/210/320/261/320/234/321/205/320/241/342/225/234/321/204/342/225/227/320/264.txt

@@ -9,29 +9,33 @@ ws test --env live --app 3d7d3ea4  --service gateway_5.4 --project vwa
 ws test --env uat --app 0f0826ab  --service gateway_5.0 --project vwa
 ws test --env live --app 0f0826ab  --service gateway_5.0 --project vwa
 奥迪aqua测试：
-ws test --env uat --app 576d9f07  --service aqua --project aodi
-ws test --env live --app 576d9f07  --service aqua --project aodi
+ws test --env uat --app 576d9f07  --service aqua --project svm
+ws test --env live --app 576d9f07  --service aqua --project svm
 上汽5.0链路sds_gateway测试：
 ws test --env uat --app 66ba7ded  --service gateway_5.0 --project svw
 ws test --env live --app 66ba7ded  --service gateway_5.0 --project svw
 
-  ws startproject d
-  python run_tests.py --env live --app 0f0826ab  --service gateway_5.0 --project vwa
-   pip install -e . 
-    ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa --testcase testcase/test_all.py::TestGateway::test[case_suite0]
+ws startproject d
+python run_tests.py --env live --app 0f0826ab  --service gateway_5.0 --project vwa
+pip install -e . 
+指定Gatewaycase
+ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa --testcase testcase/test_all.py::TestGateway::test[case_suite0]
+指定Aquacase
+testcase/test_all.py::TestAqua::test[case_suite0]
 
 关闭allure进程
 netstat -ano | findstr "8883"
-taskkill /PID 25804 /F
+taskkill  /F /PID 25804
 
-卸载
-pip uninstall WebsocketTest
-安装
-pip install WebsocketTest==1.0.14
 打包
 python setup.py sdist bdist_wheel
 上传
 twine upload --repository pypi setup_temp/dist/*
+卸载
+pip uninstall WebsocketTest
+安装
+pip install WebsocketTest==1.0.14
+
 
 
 安装虚拟环境

{websockettest-1.0.15.dist-info → websockettest-1.0.17.dist-info}/METADATA

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

{websockettest-1.0.15.dist-info → websockettest-1.0.17.dist-info}/RECORD

@@ -1,8 +1,8 @@
 WebsocketTest/__init__.py,sha256=u71SAVmbgsyp0K21kilo7pIDgeyxsaHAi93clC0OIPQ,556
-WebsocketTest/allure_installer.py,sha256=OicATAGPC2EBMCxjoKlgFFJA8lfT-qDjakLWwDA8IAU,6194
+WebsocketTest/allure_installer.py,sha256=mqcEZQsVnqMHtkH_gdiKD4ibo49u7NpLqvME1rvxBtk,6819
 WebsocketTest/cli.py,sha256=HcnjgRLM404fVszrSRAf7G1y9XLJ_ZetVtRIwavS4xE,987
-WebsocketTest/conftest.py,sha256=xD7IK7airvGH9cDbES-G9PaKUdPazVuv3utB_UfRV-8,1875
-WebsocketTest/run_tests.py,sha256=kKdanw4dWdp3IY3Bm0-GVDpMgEu5mBbTQ7hbJ1-gusM,6227
+WebsocketTest/conftest.py,sha256=ZEbTt7J--BEhCPnT30LhWS33vQr8HPEM3ZfwgoKj2fM,2164
+WebsocketTest/run_tests.py,sha256=U-53f2y5rYFbs98QGheuZkvQPqCVPF6UZKk5812i3cE,6128
 WebsocketTest/caseScript/Aqua.py,sha256=dTjVd4FPka5lMUvxa1DsGTJ6gx7NRo5NGNunrue3d0M,7439
 WebsocketTest/caseScript/Gateway.py,sha256=4_BlJPbn6X_eFHYz2orn3fXPQMPz5jRdUlj6tXkeX2Q,11748
 WebsocketTest/caseScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,15 +10,17 @@ WebsocketTest/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 WebsocketTest/commands/startproject.py,sha256=xTL6Tct8J8Ks6QD2VrQkNAWGhyv1UEMBuh2gmKCi3d0,909
 WebsocketTest/commands/test.py,sha256=16i5SI9_kfR67bGWR13Id6HUr4qvYalz4WcNSdvS4Mo,893
 WebsocketTest/common/Assertion.py,sha256=Kd86Dr6CkPGHN4747T4doyZjklhEFaQ14WCJxuN59IU,5229
-WebsocketTest/common/WSBaseApi.py,sha256=prclFQ7jV2l9GJmBssLaZks6-bhiR-q1d46GwH8hPzA,4026
+WebsocketTest/common/WSBaseApi.py,sha256=8lfmUsg5Foavo7FCvJzNhXBTVHO0wvpjkWn1swzdszg,4131
 WebsocketTest/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 WebsocketTest/common/assertUtils.py,sha256=poyL6J_WXb2BJvaABCILfiWHN7gHSTRcMWvpjk224yU,4713
 WebsocketTest/common/logger.py,sha256=JY7dJLVObKoA6E-5FJ0EMX_EyN8Otg4_4FYywKVSkcg,367
-WebsocketTest/common/utils.py,sha256=DfRwSqbci1w-omUjO4TlkqTqlc-_69Gs9JQtwL3-YSo,8704
+WebsocketTest/common/test.py,sha256=KjKL3vMQGuYsWiSmYqw2ypApUtGHBlG_6Sy1QpVkEJ4,1110
+WebsocketTest/common/utils.py,sha256=29aylauHjrKrJ40PZAcgmikA7U9RJ_qQiX2vjIxsdnA,8748
 WebsocketTest/libs/allure-2.30.0.zip,sha256=SEc2gYElQbTQrIcpJ5gLIWptfPW8kPITU8gs4wezZho,26551281
 WebsocketTest/templates/basic/conftest.py,sha256=y2_2961mhCYSRMp5X9xLq3nOmRzaTSgD3GDdrlTqxn4,1885
 WebsocketTest/templates/basic/pytest.ini,sha256=An32MB2Yy2L4EVP9WoczW8x0ISAXsgG0tlSLta-cDcs,589
-WebsocketTest/templates/basic/执行命令.txt,sha256=4qGUn4kRIfeS7yy13AWX-0K315vC3gffFXAGtVkoXkE,1574
+WebsocketTest/templates/basic/执行命令.txt,sha256=0Ocitul_eNgwkqryGA_ozPfyb5b8XlTIP2TMOgl7CaA,1650
+WebsocketTest/templates/basic/__pycache__/conftest.cpython-310-pytest-8.2.2.pyc,sha256=q2WJ_-drfCQS8zyAbemBYHaroAHA8-40KoeO2ohwV5c,1495
 WebsocketTest/templates/basic/config/svw/live.yml,sha256=dqTMDubVYO0lt2kPoHgbZW0ZVMaLO7-OjfBmHedqJuU,31
 WebsocketTest/templates/basic/config/svw/uat.yml,sha256=DX8Bn_iL5JdFHxHSo1QdRHZLC0C6pId84dit2nutkqM,30
 WebsocketTest/templates/basic/config/svw/aqua/uat.yml,sha256=Kn5vnsCVWaLuJA2m97EYy3ZN123H66-z2XSxAzgO97Q,358
@@ -32,7 +34,7 @@ WebsocketTest/templates/basic/config/vwa/gateway_5.0/live.yml,sha256=IT-AdMCEIN-
 WebsocketTest/templates/basic/config/vwa/gateway_5.0/uat.yml,sha256=-rs_eQj09D_k9mEt5_je_PmsfLbxCalWPqo1PN91yQI,253
 WebsocketTest/templates/basic/config/vwa/gateway_5.4/live.yml,sha256=NPHiuFd4NKmp-8qBikeRWWcIgA8Uv3DxWCjwgMhw3JA,287
 WebsocketTest/templates/basic/config/vwa/gateway_5.4/uat.yml,sha256=sGZ9qFIk-R5xjw4Bino19mPsrO9-4PQW8O4SQMPu56M,290
-WebsocketTest/templates/basic/data/case_data.xlsx,sha256=-wf_fwik5_sYhe62X-OpEv37B8MDYI5WkxsMLuhUcQ4,63687
+WebsocketTest/templates/basic/data/case_data.xlsx,sha256=ymHkY9H5wIDvazpbrhE81-hYOMYPp5P26ZOvwBbhoOo,63896
 WebsocketTest/templates/basic/data/audio/1+1等于几.pcm,sha256=7oLacjxnRnp2EM34vGtK4r281sKAeKg-8M9HrVzOFvQ,49906
 WebsocketTest/templates/basic/data/audio/Navigation nearby hotels.pcm,sha256=zkj6txEQVcK1sVYu8ncWSaxy4iLGPxAD_Gnc8EH0XD8,78838
 WebsocketTest/templates/basic/data/audio/Play Billy Jane.pcm,sha256=x3sE25hu23z3nju666sSqbJjOA9lZzHgs2xVBzYSEZ8,36854
@@ -83,8 +85,8 @@ WebsocketTest/templates/basic/testcase/__pycache__/test_gateway.cpython-310-pyte
 WebsocketTest/templates/basic/testcase/__pycache__/test_gateway1.cpython-310-pytest-8.2.2.pyc,sha256=9_jiZtyNwQfXe-Jz1acHxrwz5snYfBngqgTFtIWhRNA,5684
 WebsocketTest/templates/basic/testcase/__pycache__/test_gatewaybak.cpython-310-pytest-8.2.2.pyc,sha256=L50gNeQvSuFq2e-arnmKqYJR75ZrThiVaiIow5UUTjo,5587
 WebsocketTest/templates/basic/testcase/__pycache__/test_limin.cpython-310-pytest-8.2.2.pyc,sha256=hx7j0GNxlgTscC36dUBHeo401Mo3bRt1cq6t7e7dDSA,3434
-websockettest-1.0.15.dist-info/METADATA,sha256=pIda7CRcRDH1fr6AS-74N9PtuH1-p3GlBiUyRpZ1jbA,334
-websockettest-1.0.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-websockettest-1.0.15.dist-info/entry_points.txt,sha256=r5FtB9A16mLy9v8B77rzZOxgn63ao8z4FTyvJ2KS3jo,108
-websockettest-1.0.15.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
-websockettest-1.0.15.dist-info/RECORD,,
+websockettest-1.0.17.dist-info/METADATA,sha256=Fz8bn4cCgTKszTPIunMV24FerZbexid_x6ACtBc0XcA,334
+websockettest-1.0.17.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+websockettest-1.0.17.dist-info/entry_points.txt,sha256=r5FtB9A16mLy9v8B77rzZOxgn63ao8z4FTyvJ2KS3jo,108
+websockettest-1.0.17.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
+websockettest-1.0.17.dist-info/RECORD,,