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

WebsocketTest/allure_installer.py

@@ -108,16 +108,14 @@ def install_allure():
         #     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', '')}"
-        
+        add_to_user_path(ALLURE_BIN_DIR)
         return True
     except Exception as e:
         print(f"❌ 安装失败: {type(e).__name__}: {e}", file=sys.stderr)
         return False
 
 def add_to_user_path(path):
+    path = os.path.normpath(path)  # 规范化路径（去除多余的斜杠）
     """添加到用户级PATH环境变量"""
     try:
         if sys.platform == "win32":
@@ -129,22 +127,22 @@ def add_to_user_path(path):
                 winreg.KEY_READ | winreg.KEY_WRITE,
             ) as key:
                 current_path, _ = winreg.QueryValueEx(key, "Path")
-                
                 if path in current_path.split(os.pathsep):
+                    print(f"⏩ path中路径已存在: {path}")
                     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)
-            
-            # 刷新环境变量
+            # 刷新时只更新用户 PATH，不携带系统 PATH
             subprocess.run(
-                'powershell -command "[Environment]::SetEnvironmentVariable(\'Path\', $env:Path + \';{}\', \'User\')"'
-                .format(path),
+                f'powershell -command "[Environment]::SetEnvironmentVariable(\'Path\', \'{new_path}\', \'User\')"',
                 shell=True,
                 check=True
             )
             print(f"✅ 已添加PATH: {path}")
             return True
+    except PermissionError:
+        print("❌ 需要管理员权限！")
     except Exception as e:
         print(f"⚠️ 添加PATH失败: {e}\n请手动添加 {path} 到环境变量", file=sys.stderr)
         return False

WebsocketTest/common/WSBaseApi.py

@@ -7,7 +7,6 @@ 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 = {}
@@ -51,7 +50,7 @@ class BaseApiTest:
                 "请检查模块路径和类命名是否符合规范"
             ) from e
     
-
+    SHEET_NAME = f"{os.getenv('PROJECT')}-{os.getenv('SERVICE')}"
     @pytest.mark.parametrize('case_suite', gen_case_suite(CASE_PATH,sheet_name=SHEET_NAME))
     def test(self, case_suite, setup_env):
         """测试用例执行模板"""

WebsocketTest/conftest.py

@@ -2,9 +2,6 @@ import pytest
 import yaml
 from pathlib import Path
 
-SHEET_NAME = "0"  # 默认值
-
-
 # 设置环境信息的 fixture
 @pytest.fixture(scope="session")
 def setup_env(request):
@@ -59,11 +56,4 @@ def pytest_addoption(parser):
         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

@@ -1,4 +1,4 @@
-import subprocess
+import subprocess,pytest
 import argparse
 import shutil
 import time
@@ -72,27 +72,27 @@ class TestRunner:
 
     def run_pytest_tests(self) -> bool:
         """执行pytest测试"""  
-        # 构建基础命令列表
+        # # 构建基础命令列表
         cmd = [
-            "pytest",
             "-m", self.args.service.split('_')[0],
             "--env", self.args.env,
             "--app", self.args.app,
             "--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) 
+            cmd.insert(0, self.args.testcase) 
         try:
             # logger.info(f"run_pytest_tests Executing: {' '.join(cmd)}")
-            subprocess.run(cmd, check=True, timeout=3600)
-        except subprocess.CalledProcessError as e:
-            logger.error(f"Tests failed with exit code {e.returncode}")
-        except subprocess.TimeoutExpired:
-            logger.error("Test execution timed out after 1 hour")
+            import os
+            os.environ["PROJECT"] = self.args.project
+            os.environ["SERVICE"] = self.args.service
+            # 调用 pytest
+            pytest.main(cmd)
+        except Exception as e:
+            logger.error(f"Test execution failed: {e}")
 
     def generate_allure_report(self) -> bool:
         """生成Allure报告"""

WebsocketTest/templates/basic/README.md

@@ -0,0 +1,85 @@
+# WebSocket 接口自动化测试工具 (WebSocketTest)
+
+#### 介绍
+
+这是一个基于 WebSocket 协议的接口自动化测试工具。它可以用于自动化测试 WebSocket 接口，确保接口的稳定性和可靠性。
+
+#### 系统要求
+
+**Python 3.10+**：确保你的系统上已经安装了 Python 3.10（推荐使用最新稳定版）。
+
+
+#### 安装步骤
+
+**1.安装 Python：**
+确保你的系统上已经安装了 Python 3.10 或更高版本。你可以从 [Python 官方网站 ](https://www.python.org/downloads/?spm=5176.28103460.0.0.40f75d27PnqPkU)下载并安装。
+**2.安装 WebSocketTest 工具：**
+
+```
+pip install WebsocketTest
+```
+
+**3.安装allure 工具：**
+```
+install-allure
+<!-- 注：allure安装完，会自动配置环境变量，需要重启终端才能生效 -->
+```
+**4.创建测试项目：**
+```
+<!-- 一次性操作，yourtestProject创建成功以后，测试直接cd到yourtestProject下，进行ws test -->
+ws startproject yourtestProject
+cd yourtestProject
+```
+
+**5.运行测试：**
+  在命令行中运行以下命令：
+
+```
+<!-- 安徽5.0链路aqua测试： -->
+ws test --env uat --app 0f0826ab  --service aqua --project vwa
+ws test --env live --app 0f0826ab  --service aqua --project vwa
+<!-- 安徽5.4链路sds_gateway测试： -->
+ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa
+ws test --env live --app 3d7d3ea4  --service gateway_5.4 --project vwa
+<!-- 安徽5.0链路sds_gateway测试： -->
+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 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
+
+<!-- 指定Gatewaycase -->
+ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa --testcase testcase/test_all.py::TestGateway::test[case_suite0]
+<!-- 指定Aquacase -->
+ws test --env uat --app 0f0826ab  --service aqua --project vwa --testcase testcase/test_all.py::TestAqua::test[case_suite0]
+```
+
+#### 其他
+```
+<!-- 本地开发模式调试 -->
+pip install -e . 
+
+<!-- 打包 -->
+python setup.py sdist bdist_wheel
+<!-- 上传 -->
+twine upload --repository pypi setup_temp/dist/*
+<!-- 卸载 -->
+pip uninstall WebsocketTest
+<!-- 安装 -->
+pip install WebsocketTest==1.0.14
+
+<!-- 关闭allure进程 -->
+netstat -ano | findstr "8883"
+taskkill  /F /PID xxID
+
+<!-- 安装虚拟环境 -->
+python -m venv venv   
+<!-- 激活venv虚拟环境 -->
+Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
+.\venv\Scripts\Activate.ps1
+<!-- 退出venv -->
+deactivate
+```

WebsocketTest/templates/basic/conftest.py

@@ -30,7 +30,6 @@ def setup_env(request):
             'service': service,
             'project': project})
     return environments
-
 # 添加命令行选项
 def pytest_addoption(parser):
     parser.addoption(
@@ -57,7 +56,4 @@ def pytest_addoption(parser):
         default="vwa",
         help="Project name is required"
     )
-
-
-
-
+    

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

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.17
+Version: 1.0.19
 Summary: websocket api autotest
-Requires-Dist: allure_python_commons==2.13.5
-Requires-Dist: numpy==2.2.4
+Requires-Dist: allure-pytest==2.13.5
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pytest==8.2.2
 Requires-Dist: PyYAML==6.0.2

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

@@ -1,8 +1,8 @@
 WebsocketTest/__init__.py,sha256=u71SAVmbgsyp0K21kilo7pIDgeyxsaHAi93clC0OIPQ,556
-WebsocketTest/allure_installer.py,sha256=mqcEZQsVnqMHtkH_gdiKD4ibo49u7NpLqvME1rvxBtk,6819
+WebsocketTest/allure_installer.py,sha256=q6d3dIJVeL6gFCyqVUAAIwtmDVuM2cFgOzEAU2BfCSY,6852
 WebsocketTest/cli.py,sha256=HcnjgRLM404fVszrSRAf7G1y9XLJ_ZetVtRIwavS4xE,987
-WebsocketTest/conftest.py,sha256=ZEbTt7J--BEhCPnT30LhWS33vQr8HPEM3ZfwgoKj2fM,2164
-WebsocketTest/run_tests.py,sha256=U-53f2y5rYFbs98QGheuZkvQPqCVPF6UZKk5812i3cE,6128
+WebsocketTest/conftest.py,sha256=qFAgwWwi2_MjmN6LMlj_zk3XADcYqp2cr5t8qxYHF1g,1879
+WebsocketTest/run_tests.py,sha256=ippnfovdOn1vDxNWXMZTUsWYdT--4eAtfubv9qgsIRY,6063
 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,17 +10,16 @@ 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=8lfmUsg5Foavo7FCvJzNhXBTVHO0wvpjkWn1swzdszg,4131
+WebsocketTest/common/WSBaseApi.py,sha256=8ErG6EeQrF-lw0TS0rRyEYp_-De1ZA--WgJ0TbvUuIw,4149
 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/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/README.md,sha256=3YJSUPSTxTYmJrUHvyCjFivK8XD-5FgvVainTVRdiaI,2927
+WebsocketTest/templates/basic/conftest.py,sha256=qFAgwWwi2_MjmN6LMlj_zk3XADcYqp2cr5t8qxYHF1g,1879
 WebsocketTest/templates/basic/pytest.ini,sha256=An32MB2Yy2L4EVP9WoczW8x0ISAXsgG0tlSLta-cDcs,589
-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/__pycache__/conftest.cpython-310-pytest-8.2.2.pyc,sha256=6XLNaJ6_0w_6zXPawybQR8yT1svXwLKlZehtjDtvm_A,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
@@ -85,8 +84,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.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,,
+websockettest-1.0.19.dist-info/METADATA,sha256=AvFUAKdICFII19SlBtfruhnbxwRZFy6BSua7SKfxQ98,297
+websockettest-1.0.19.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+websockettest-1.0.19.dist-info/entry_points.txt,sha256=r5FtB9A16mLy9v8B77rzZOxgn63ao8z4FTyvJ2KS3jo,108
+websockettest-1.0.19.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
+websockettest-1.0.19.dist-info/RECORD,,

WebsocketTest/common/test.py

@@ -1,36 +0,0 @@
-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/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

@@ -1,47 +0,0 @@
- 
-安徽5.0链路aqua测试：
-ws test --env uat --app 0f0826ab  --service aqua --project vwa
-ws test --env live --app 0f0826ab  --service aqua --project vwa
-安徽5.4链路sds_gateway测试：
-ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa
-ws test --env live --app 3d7d3ea4  --service gateway_5.4 --project vwa
-安徽5.0链路sds_gateway测试：
-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 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 . 
-指定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  /F /PID 25804
-
-打包
-python setup.py sdist bdist_wheel
-上传
-twine upload --repository pypi setup_temp/dist/*
-卸载
-pip uninstall WebsocketTest
-安装
-pip install WebsocketTest==1.0.14
-
-
-
-安装虚拟环境
-python -m venv venv   
-激活venv虚拟环境
-Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
-.\venv\Scripts\Activate.ps1
-退出venv
-deactivate