WebsocketTest 1.0.18__tar.gz → 1.0.19__tar.gz

{websockettest-1.0.18 → websockettest-1.0.19}/PKG-INFO

@@ -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/WebsocketTest/templates/basic → websockettest-1.0.19}/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 → websockettest-1.0.19}/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-1.0.18 → websockettest-1.0.19/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 → websockettest-1.0.19}/WebsocketTest.egg-info/PKG-INFO

@@ -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 → websockettest-1.0.19}/WebsocketTest.egg-info/requires.txt

@@ -1,5 +1,4 @@
-allure_python_commons==2.13.5
-numpy==2.2.4
+allure-pytest==2.13.5
 pandas==2.2.3
 pytest==8.2.2
 PyYAML==6.0.2

{websockettest-1.0.18 → websockettest-1.0.19}/setup.py

@@ -31,7 +31,7 @@ setup(
         'bdist_wheel': CustomBdistWheel
     },
     name="WebsocketTest",
-    version="1.0.18",
+    version="1.0.19",
     packages=find_packages(exclude=[
         "WebsocketTest.allure_report", 
         "WebsocketTest.logs", 
@@ -43,8 +43,7 @@ setup(
     include_package_data=True,  # 这行很重要，会读取MANIFEST.in
     description="websocket api autotest",
     install_requires = [
-        "allure_python_commons==2.13.5",
-        "numpy==2.2.4",
+        "allure-pytest==2.13.5",
         "pandas==2.2.3",
         "pytest==8.2.2",
         "PyYAML==6.0.2",