WebsocketTest 1.0.2__tar.gz → 1.0.4__tar.gz

websockettest-1.0.4/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: WebsocketTest
+Version: 1.0.4
+Summary: websocket api autotest
+Author: chencheng
+Requires-Python: >=3.10
+Requires-Dist: allure_python_commons==2.13.5
+Requires-Dist: numpy==2.2.4
+Requires-Dist: pandas==2.2.3
+Requires-Dist: pytest==8.2.2
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: websockets==12.0
+Dynamic: author
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

websockettest-1.0.4/WebsocketTest/__init__.py

@@ -0,0 +1,21 @@
+__version__ = "1.1.0"
+__description__ = "One-stop solution for AUTO testing."
+
+# import firstly for monkey patch if needed
+# from pastor.ext.locust import main_locusts
+# from pastor.parser import parse_parameters as Parameters
+# from pastor.runner import Pastor
+# from pastor.testcase import Config, Step, RunRequest, RunTestCase, RunLocation
+
+__all__ = [
+    "__version__",
+    "__description__"
+    # ,
+    # "Pastor",
+    # "Config",
+    # "Step",
+    # "RunLocation",
+    # "RunRequest",
+    # "RunTestCase",
+    # "Parameters",
+]

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/caseScript/Aqua.py

@@ -1,8 +1,8 @@
 
-from common.utils import *
+from WebsocketTest.common.utils import *
 from urllib.parse import quote_plus 
-from common import WSBaseApi
-from common.WSBaseApi import WSBaseApi
+from WebsocketTest.common import WSBaseApi
+from WebsocketTest.common.WSBaseApi import WSBaseApi
 
 
 

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/caseScript/Gateway.py

@@ -6,8 +6,8 @@ import hashlib
 import hmac,time
 from urllib.parse import urlencode, urlparse
 import uuid
-from common.utils import *
-from common.WSBaseApi import WSBaseApi
+from WebsocketTest.common.utils import *
+from WebsocketTest.common.WSBaseApi import WSBaseApi
 from pathlib import Path
 
 class ApiTestRunner(WSBaseApi):
@@ -66,7 +66,7 @@ class ApiTestRunner(WSBaseApi):
         while True:
             try:
                 msg = await ws.recv()
-                # print(msg)
+                print(msg)
                 response_data = json.loads(msg)
                 # code 返回码，0表示成功，其它表示异常
                 if response_data["header"]["code"] == 0:

websockettest-1.0.4/WebsocketTest/cli.py

@@ -0,0 +1,26 @@
+import argparse
+from pathlib import Path
+from importlib import import_module
+
+def main():
+    parser = argparse.ArgumentParser(description="ws CLI")
+    subparsers = parser.add_subparsers(dest='command', required=True)
+    
+    # 动态加载子命令
+    commands_dir = Path(__file__).parent / "commands"
+    for cmd_file in commands_dir.glob("*.py"):
+        if cmd_file.stem != "__init__":
+            cmd_name = cmd_file.stem
+            module = import_module(f"WebsocketTest.commands.{cmd_name}")
+            cmd_parser = subparsers.add_parser(cmd_name, help=module.__doc__)
+            if hasattr(module, 'configure_parser'):
+                module.configure_parser(cmd_parser)
+            # 关键：绑定执行函数
+            if hasattr(module, 'func'):
+                cmd_parser.set_defaults(func=module.func)
+    args = parser.parse_args()
+    args.func(args)  # 调用子命令的执行函数
+
+ 
+if __name__ == "__main__":
+    main()

websockettest-1.0.4/WebsocketTest/commands/startproject.py

@@ -0,0 +1,28 @@
+import shutil
+from pathlib import Path
+
+
+def configure_parser(parser):
+    """配置子命令参数"""
+    parser.add_argument("project_name", help="项目名称")
+    parser.add_argument("-t", "--template", 
+                       choices=["basic", "advanced"], 
+                       default="basic")
+    parser.add_argument("--force", action="store_true", 
+                       help="覆盖已存在目录")
+
+def execute(args):
+    """执行项目创建"""
+    template_dir = Path(__file__).parent.parent / "templates" / args.template
+    target_dir = Path.cwd() / args.project_name
+    
+    if target_dir.exists():
+        if not args.force:
+            raise FileExistsError(f"目录已存在: {target_dir}")
+        shutil.rmtree(target_dir)
+    
+    shutil.copytree(template_dir, target_dir)
+    print(f"项目创建成功: {target_dir}")
+
+# 注册到主CLI
+func = execute

websockettest-1.0.4/WebsocketTest/commands/test.py

@@ -0,0 +1,19 @@
+
+from WebsocketTest.run_tests import TestRunner
+
+
+def configure_parser(parser):
+    """配置子命令参数"""
+    parser.add_argument("--env", required=True, help="Test environment")
+    parser.add_argument("--app", required=True, help="Application ID")
+    parser.add_argument("--service", required=True, help="Service name")
+    parser.add_argument("--project", required=True, help="Project name")
+    parser.add_argument("--port", type=int, default=8883, help="Allure report port")
+    parser.add_argument("--report-dir", default="allure_report", help="Allure report directory")
+
+def execute(args):
+    """执行test"""
+    test_runner = TestRunner(args)
+    exit(test_runner.run())
+# 注册到主CLI
+func = execute

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/common/Assertion.py

@@ -1,6 +1,6 @@
 
 from datetime import datetime, timedelta,date
-from common.assertUtils import *
+from WebsocketTest.common.assertUtils import *
 import pytest
 
 

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/common/WSBaseApi.py

@@ -1,10 +1,10 @@
 import websockets
 from functools import cached_property
 import asyncio
-from common.utils import *
+from WebsocketTest.common.utils import *
 import allure
 from pathlib import Path
-from common.Assertion import Assert
+from WebsocketTest.common.Assertion import Assert
 import pytest
 import traceback
 class WSBaseApi:
@@ -39,7 +39,7 @@ class BaseApiTest:
     def API_TEST_RUNNER_CLASS(self):
         """动态加载对应的测试运行器类（自动缓存）"""
         class_prefix = self.__class__.__name__[4:]  # TestGateway -> Gateway
-        module_path = f"caseScript.{class_prefix}"
+        module_path = f"WebsocketTest.caseScript.{class_prefix}"
         
         try:
             module = __import__(module_path, fromlist=['ApiTestRunner'])

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/common/WebSocketApi.py

@@ -1,7 +1,7 @@
 import _thread as thread
 import logging
 import websocket  # 使用websocket_client
-from common.utils import *
+from WebsocketTest.common.utils import *
 
 class WebSocketApi:
     def __init__(self, url, request):

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/common/assertUtils.py

@@ -1,5 +1,5 @@
 import re
-from common.utils import *
+from WebsocketTest.common.utils import *
 from typing import Literal
 
 def get_value(data, path, decode_funcs=None):

{WebsocketTest-1.0.2 → websockettest-1.0.4/WebsocketTest}/common/utils.py

@@ -6,7 +6,7 @@ import string
 from datetime import datetime
 import email.utils
 from functools import wraps
-from common.logger import *
+from WebsocketTest.common.logger import *
 from typing import Optional, Union, Literal
 import numpy as np
 def get_rfc1123_time():

websockettest-1.0.4/WebsocketTest/conftest.py

@@ -0,0 +1,63 @@
+import pytest
+import yaml
+from pathlib import Path
+
+# 设置环境信息的 fixture
+@pytest.fixture(scope="session")
+def setup_env(request):
+    # 获取命令行参数
+    service = request.config.getoption("service")
+    project = request.config.getoption("project")
+    env = request.config.getoption("env")
+    app_id = request.config.getoption("app")
+     # 获取当前工作目录，并解析为绝对路径
+    current_working_directory = Path.cwd().resolve()
+    config_dir = current_working_directory.joinpath('config', project)
+    
+    # Load base configuration
+    with open(config_dir.joinpath(f'{env}.yml')) as base_file:
+        config = yaml.safe_load(base_file)
+    
+    # Load environment-specific configuration and merge into the base config
+    with open(config_dir.joinpath(service, f'{env}.yml')) as env_file:
+        env_config = yaml.safe_load(env_file)
+    # 合并配置
+    environments = config.get('environments', {})
+    environments.update(env_config.get('environments', {}))
+    # 添加运行时参数
+    environments.update({'appId': app_id,
+            'env_name': env,
+            'service': service,
+            'project': project})
+    return environments
+
+# 添加命令行选项
+def pytest_addoption(parser):
+    parser.addoption(
+        "--env",
+        action="store",
+        default="uat",
+        help="Environment to use (default: uat)"
+    )
+    parser.addoption(
+        "--app",
+        action="store",
+        default="0f0826ab",
+        help="App to use (default: 0f0826ab)"
+    )
+    parser.addoption(
+        "--service",
+        action="store",
+        default="0f0826ab",
+        help="Service to use (default: aqua)"
+    )
+    parser.addoption(
+        "--project",
+        action="store",
+        default="vwa",
+        help="Project name is required"
+    )
+
+
+
+

websockettest-1.0.4/WebsocketTest/run_tests.py

@@ -0,0 +1,147 @@
+import subprocess
+import argparse
+import shutil
+from WebsocketTest.common.logger import *
+import time
+import webbrowser
+from urllib.request import urlopen
+from urllib.error import URLError
+logger = logging.getLogger('run_tests')
+from pathlib import Path
+
+class AllureManager:
+    def __init__(self, port: int = 8883):
+        self.port = port
+        self.allure_path = shutil.which("allure")
+        if not self.allure_path:
+            raise RuntimeError("Allure command line tool not found in PATH")
+
+    def is_server_running(self) -> bool:
+        """检查Allure服务是否已在运行"""
+        try:
+            with urlopen(f"http://localhost:{self.port}") as response:
+                return response.status == 200
+        except URLError:
+            return False
+
+    def start_server(self, report_dir: str) -> bool:
+        """启动Allure服务"""
+        try:
+            cmd = [self.allure_path, "open", report_dir, "-p", str(self.port)]
+            logger.info(f"start_server Executing: {' '.join(cmd)}")
+            subprocess.Popen(
+                cmd,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                start_new_session=True
+            )
+            
+            time.sleep(3)  # 等待服务启动
+            return True
+        except Exception as e:
+            logger.error(f"Failed to start Allure server: {e}")
+            return False
+
+    def refresh_browser_tab(self) -> bool:
+        """尝试刷新已打开的Allure标签页"""
+        url = f"http://localhost:{self.port}"
+        
+        # 方法1: 使用JavaScript刷新（需要浏览器支持）
+        try:
+            webbrowser.open_new_tab("javascript:location.reload(true);")
+            return True
+        except Exception as e:
+            logger.warning(f"JavaScript refresh failed: {e}")
+        
+        # 方法2: 使用webbrowser直接打开（会聚焦到已有标签页）
+        try:
+            browser = webbrowser.get() # 获取系统默认浏览器控制器
+            if hasattr(browser, 'open_new_tab'):
+                browser.open_new_tab(url)  # 大多数浏览器会聚焦到已有标签页
+                return True
+        except Exception as e:
+            logger.error(f"Browser refresh failed: {e}")
+        
+        return False
+
+class TestRunner:
+    def __init__(self, args):
+        """直接存储args对象"""
+        self.args = args
+        self.allure_manager = AllureManager(self.args.port)
+        self.allure_results = str(Path.cwd().joinpath("allure_results"))
+
+    def run_pytest_tests(self) -> bool:
+        """执行pytest测试"""
+        case = self.args.service.split('_')[0]
+        
+        cmd = [
+            "pytest", str(Path.cwd().joinpath("testcase","test_all.py")),
+            "-m", case,
+            "--env", self.args.env,
+            "--app", self.args.app,
+            "--service", self.args.service,
+            "--project", self.args.project,
+            "--alluredir", self.allure_results
+        ]
+        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")
+
+    def generate_allure_report(self) -> bool:
+        """生成Allure报告"""
+        try:
+            cmd = [self.allure_manager.allure_path, "generate", self.allure_results, "-o", self.args.report_dir, "--clean"]
+            subprocess.run(
+                cmd,
+                check=True,
+                timeout=300
+            )
+            logger.info(f"generate_allure_report Executing: {' '.join(cmd)}")
+        except subprocess.CalledProcessError as e:
+            logger.error(f"Report generation failed: {e}")
+    def _handle_allure_report(self) -> bool:
+        """Handle Allure report serving and browser opening."""
+        if  self.allure_manager.is_server_running():
+            logger.info("Refreshing existing Allure report tab...")
+            if not self.allure_manager.refresh_browser_tab():
+                logger.info("Opening new report...")
+                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}")
+    def run(self):
+        # 1. 运行测试
+        self.run_pytest_tests()
+
+        # 2. 生成报告数据
+        self.generate_allure_report()
+
+        # 3. 启动Allure服务
+        self._handle_allure_report()
+        logger.info(f"http://localhost:{self.args.port}")
+        return 0
+
+if __name__ == "__main__":
+    try:
+        parser = argparse.ArgumentParser(description="Run tests with Allure reporting")
+        parser.add_argument("--env", required=True, help="Test environment")
+        parser.add_argument("--app", required=True, help="Application ID")
+        parser.add_argument("--service", required=True, help="Service name")
+        parser.add_argument("--project", required=True, help="Project name")
+        parser.add_argument("--port", type=int, default=8883, help="Allure report port")
+        parser.add_argument("--report-dir", default="allure_report", help="Allure report directory")
+        args = parser.parse_args()
+        test_runner = TestRunner(args)
+        exit(test_runner.run())
+    except KeyboardInterrupt:
+        logger.info("Process interrupted by user")
+        exit(1)
+    except Exception as e:
+        logger.error(f"Unexpected error: {e}", exc_info=True)
+        exit(1)  

websockettest-1.0.4/WebsocketTest.egg-info/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: WebsocketTest
+Version: 1.0.4
+Summary: websocket api autotest
+Author: chencheng
+Requires-Python: >=3.10
+Requires-Dist: allure_python_commons==2.13.5
+Requires-Dist: numpy==2.2.4
+Requires-Dist: pandas==2.2.3
+Requires-Dist: pytest==8.2.2
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: websockets==12.0
+Dynamic: author
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

websockettest-1.0.4/WebsocketTest.egg-info/SOURCES.txt

@@ -0,0 +1,26 @@
+README.md
+setup.cfg
+setup.py
+WebsocketTest/__init__.py
+WebsocketTest/cli.py
+WebsocketTest/conftest.py
+WebsocketTest/run_tests.py
+WebsocketTest.egg-info/PKG-INFO
+WebsocketTest.egg-info/SOURCES.txt
+WebsocketTest.egg-info/dependency_links.txt
+WebsocketTest.egg-info/entry_points.txt
+WebsocketTest.egg-info/requires.txt
+WebsocketTest.egg-info/top_level.txt
+WebsocketTest/caseScript/Aqua.py
+WebsocketTest/caseScript/Gateway.py
+WebsocketTest/caseScript/__init__.py
+WebsocketTest/commands/__init__.py
+WebsocketTest/commands/startproject.py
+WebsocketTest/commands/test.py
+WebsocketTest/common/Assertion.py
+WebsocketTest/common/WSBaseApi.py
+WebsocketTest/common/WebSocketApi.py
+WebsocketTest/common/__init__.py
+WebsocketTest/common/assertUtils.py
+WebsocketTest/common/logger.py
+WebsocketTest/common/utils.py

websockettest-1.0.4/WebsocketTest.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+ws = WebsocketTest.cli:main

websockettest-1.0.4/WebsocketTest.egg-info/top_level.txt

@@ -0,0 +1 @@
+WebsocketTest

{WebsocketTest-1.0.2 → websockettest-1.0.4}/setup.cfg

@@ -1,6 +1,9 @@
 [metadata]
 description_file = README.MD
 
+[build]
+build_base = setup_temp/build
+
 [egg_info]
 tag_build = 
 tag_date = 0

websockettest-1.0.4/setup.py

@@ -0,0 +1,43 @@
+from setuptools import find_packages, setup
+from setuptools.command.sdist import sdist
+from setuptools.command.bdist_wheel import bdist_wheel
+
+class CustomSdist(sdist):
+    def initialize_options(self):
+        super().initialize_options()
+        self.dist_dir = "setup_temp/dist"  # 自定义sdist路径
+
+class CustomBdistWheel(bdist_wheel):
+    def initialize_options(self):
+        super().initialize_options()
+        self.dist_dir = "setup_temp/dist"  # 自定义wheel路径
+
+setup(
+    cmdclass={
+        'sdist': CustomSdist,
+        'bdist_wheel': CustomBdistWheel
+    },
+    name="WebsocketTest",
+    version="1.0.4",
+    author='chencheng',
+    python_requires=">=3.10",
+    packages=find_packages(exclude=["WebsocketTest.allure_report", "WebsocketTest.logs", "WebsocketTest.allure_results",  "WebsocketTest.config", "WebsocketTest.data","WebsocketTest.testcase"]),
+    description="websocket api autotest",
+    install_requires = [
+        "allure_python_commons==2.13.5",
+        "numpy==2.2.4",
+        "pandas==2.2.3",
+        "pytest==8.2.2",
+        "PyYAML==6.0.2",
+        "websockets==12.0"
+    ],
+    entry_points={
+        'console_scripts': [
+            "ws=WebsocketTest.cli:main"
+        ]
+    }
+)
+import shutil
+
+# 清理 .egg-info 文件夹
+shutil.rmtree('WebsocketTest.egg-info', ignore_errors=True)

WebsocketTest-1.0.2/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: WebsocketTest
-Version: 1.0.2
-Summary: websocket api autotest
-Author: chencheng
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown

WebsocketTest-1.0.2/WebsocketTest.egg-info/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: WebsocketTest
-Version: 1.0.2
-Summary: websocket api autotest
-Author: chencheng
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown

WebsocketTest-1.0.2/WebsocketTest.egg-info/SOURCES.txt

@@ -1,21 +0,0 @@
-README.md
-setup.cfg
-setup.py
-WebsocketTest.egg-info/PKG-INFO
-WebsocketTest.egg-info/SOURCES.txt
-WebsocketTest.egg-info/dependency_links.txt
-WebsocketTest.egg-info/entry_points.txt
-WebsocketTest.egg-info/requires.txt
-WebsocketTest.egg-info/top_level.txt
-caseScript/Aqua.py
-caseScript/Gateway.py
-caseScript/__init__.py
-common/Assertion.py
-common/WSBaseApi.py
-common/WebSocketApi.py
-common/__init__.py
-common/assertUtils.py
-common/logger.py
-common/utils.py
-testcase/__init__.py
-testcase/test_all.py

WebsocketTest-1.0.2/WebsocketTest.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-wsrun = WebsocketTest.cli:main_run_alias

WebsocketTest-1.0.2/WebsocketTest.egg-info/top_level.txt

@@ -1,3 +0,0 @@
-caseScript
-common
-testcase

WebsocketTest-1.0.2/setup.py

@@ -1,26 +0,0 @@
-from setuptools import find_packages, setup
-
-
-setup(
-    name="WebsocketTest",
-    version="1.0.2",
-    author='chencheng',
-    python_requires=">=3.10",
-    packages=find_packages(exclude=["allure_report", "logs", "allure_results",  "config", "data"]),
-    description="websocket api autotest",
-    # long_description=open('README.md','r',encoding='utf-8').read(),
-    long_description_content_type='text/markdown',
-    install_requires = [
-        "allure_python_commons==2.13.5",
-        "numpy==2.2.4",
-        "pandas==2.2.3",
-        "pytest==8.2.2",
-        "PyYAML==6.0.2",
-        "websockets==12.0"
-    ],
-    entry_points={
-        'console_scripts': [
-            'wsrun=WebsocketTest.cli:main_run_alias'
-        ]
-    }
-)

WebsocketTest-1.0.2/testcase/test_all.py

@@ -1,10 +0,0 @@
-# 具体测试类实现
-from common.WSBaseApi import BaseApiTest
-import pytest
-
-@pytest.mark.gateway
-class TestGateway(BaseApiTest):pass
-
-
-@pytest.mark.aqua
-class TestAqua(BaseApiTest):pass