WebsocketTest 1.0.18__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/templates/basic/README.md

@@ -22,10 +22,11 @@ pip install WebsocketTest
 **3.安装allure 工具：**
 ```
 install-allure
+<!-- 注：allure安装完，会自动配置环境变量，需要重启终端才能生效 -->
 ```
 **4.创建测试项目：**
 ```
-# 一次性操作，yourtestProject创建成功以后，测试直接cd到yourtestProject下，进行ws test
+<!-- 一次性操作，yourtestProject创建成功以后，测试直接cd到yourtestProject下，进行ws test -->
 ws startproject yourtestProject
 cd yourtestProject
 ```
@@ -53,10 +54,10 @@ 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/test_all.py::TestAqua::test[case_suite0]
+ws test --env uat --app 0f0826ab  --service aqua --project vwa --testcase testcase/test_all.py::TestAqua::test[case_suite0]
 ```
 
-**6.其他：**
+#### 其他
 ```
 <!-- 本地开发模式调试 -->
 pip install -e . 

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

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.18
+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.18.dist-info → websockettest-1.0.19.dist-info}/RECORD

@@ -1,5 +1,5 @@
 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=qFAgwWwi2_MjmN6LMlj_zk3XADcYqp2cr5t8qxYHF1g,1879
 WebsocketTest/run_tests.py,sha256=ippnfovdOn1vDxNWXMZTUsWYdT--4eAtfubv9qgsIRY,6063
@@ -16,7 +16,7 @@ WebsocketTest/common/assertUtils.py,sha256=poyL6J_WXb2BJvaABCILfiWHN7gHSTRcMWvpj
 WebsocketTest/common/logger.py,sha256=JY7dJLVObKoA6E-5FJ0EMX_EyN8Otg4_4FYywKVSkcg,367
 WebsocketTest/common/utils.py,sha256=29aylauHjrKrJ40PZAcgmikA7U9RJ_qQiX2vjIxsdnA,8748
 WebsocketTest/libs/allure-2.30.0.zip,sha256=SEc2gYElQbTQrIcpJ5gLIWptfPW8kPITU8gs4wezZho,26551281
-WebsocketTest/templates/basic/README.md,sha256=QMs4YT60mCOS7Q-VbUd_UcZa85pzg2SlJTT8Zjc_osQ,2818
+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/__pycache__/conftest.cpython-310-pytest-8.2.2.pyc,sha256=6XLNaJ6_0w_6zXPawybQR8yT1svXwLKlZehtjDtvm_A,1495
@@ -84,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.18.dist-info/METADATA,sha256=sGMYizgs4CjS4qwECOk5lHsO5OA8JfdjtcUTx7iIzbU,334
-websockettest-1.0.18.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-websockettest-1.0.18.dist-info/entry_points.txt,sha256=r5FtB9A16mLy9v8B77rzZOxgn63ao8z4FTyvJ2KS3jo,108
-websockettest-1.0.18.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
-websockettest-1.0.18.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,,