WebsocketTest 1.0.17__tar.gz → 1.0.18__tar.gz

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

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

{websockettest-1.0.17 → websockettest-1.0.18}/README.md

@@ -25,6 +25,7 @@ install-allure
 ```
 **4.创建测试项目：**
 ```
+# 一次性操作，yourtestProject创建成功以后，测试直接cd到yourtestProject下，进行ws test
 ws startproject yourtestProject
 cd yourtestProject
 ```
@@ -33,7 +34,6 @@ cd yourtestProject
   在命令行中运行以下命令：
 
 ```
- 
 <!-- 安徽5.0链路aqua测试： -->
 ws test --env uat --app 0f0826ab  --service aqua --project vwa
 ws test --env live --app 0f0826ab  --service aqua --project vwa
@@ -55,3 +55,30 @@ ws test --env uat --app 3d7d3ea4  --service gateway_5.4 --project vwa --testcase
 <!-- 指定Aquacase -->
 ws test --env uat --app 0f0826ab  --service aqua --project vwa testcase/test_all.py::TestAqua::test[case_suite0]
 ```
+
+**6.其他：**
+```
+<!-- 本地开发模式调试 -->
+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-1.0.17 → websockettest-1.0.18}/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-1.0.17/WebsocketTest/templates/basic → websockettest-1.0.18/WebsocketTest}/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 → websockettest-1.0.18}/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-1.0.18/WebsocketTest/templates/basic/README.md

@@ -0,0 +1,84 @@
+# 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
+```
+**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/test_all.py::TestAqua::test[case_suite0]
+```
+
+**6.其他：**
+```
+<!-- 本地开发模式调试 -->
+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-1.0.17/WebsocketTest → websockettest-1.0.18/WebsocketTest/templates/basic}/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-1.0.17 → websockettest-1.0.18}/WebsocketTest.egg-info/PKG-INFO

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

{websockettest-1.0.17 → websockettest-1.0.18}/WebsocketTest.egg-info/SOURCES.txt

@@ -24,12 +24,11 @@ WebsocketTest/common/WSBaseApi.py
 WebsocketTest/common/__init__.py
 WebsocketTest/common/assertUtils.py
 WebsocketTest/common/logger.py
-WebsocketTest/common/test.py
 WebsocketTest/common/utils.py
 WebsocketTest/libs/allure-2.30.0.zip
+WebsocketTest/templates/basic/README.md
 WebsocketTest/templates/basic/conftest.py
 WebsocketTest/templates/basic/pytest.ini
-WebsocketTest/templates/basic/执行命令.txt
 WebsocketTest/templates/basic/__pycache__/conftest.cpython-310-pytest-8.2.2.pyc
 WebsocketTest/templates/basic/config/svw/live.yml
 WebsocketTest/templates/basic/config/svw/uat.yml

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

@@ -31,7 +31,7 @@ setup(
         'bdist_wheel': CustomBdistWheel
     },
     name="WebsocketTest",
-    version="1.0.17",
+    version="1.0.18",
     packages=find_packages(exclude=[
         "WebsocketTest.allure_report", 
         "WebsocketTest.logs", 
@@ -58,6 +58,5 @@ setup(
     }
 )
 # import shutil
-
 # # # 清理 .egg-info 文件夹
 # shutil.rmtree('WebsocketTest.egg-info', ignore_errors=True)

websockettest-1.0.17/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-1.0.17/WebsocketTest/templates/basic//346/211/247/350/241/214/345/221/275/344/273/244.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