WebsocketTest 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

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/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/cli.py

@@ -1,56 +1,26 @@
 import argparse
-import enum
-import sys
-import pytest
-
-def main_run(pytest_args: list) -> enum.IntEnum:
-    """Run pytest with given arguments
-    
-    Args:
-        pytest_args: List of arguments to pass to pytest
-        
-    Returns:
-        pytest.ExitCode enum value
-    """
-    print("Running pytest with args:", pytest_args)
-    return pytest.main(pytest_args)
+from pathlib import Path
+from importlib import import_module
 
 def main():
-    """API test: parse command line options and run commands."""
-    # 主解析器
-    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")
-    
-    # 解析参数，分离已知参数和要传递给pytest的参数
-    args, pytest_args = parser.parse_known_args()
+    parser = argparse.ArgumentParser(description="ws CLI")
+    subparsers = parser.add_subparsers(dest='command', required=True)
     
-    # 打印调试信息
-    print("Tool arguments:")
-    print(vars(args))
-    print("Pytest arguments:", pytest_args)
-    
-    # 将工具参数转换为pytest可用的格式
-    pytest_args.extend([
-        f"--env={args.env}",
-        f"--app={args.app}",
-        f"--service={args.service}",
-        f"--project={args.project}"
-    ])
-    
-    # 运行测试
-    return_code = main_run(pytest_args)
-    
-    # 返回退出码
-    sys.exit(return_code)
-def main_run_alias():
-    """ command alias
-        prun = pastor run
-    """
-    main()
+    # 动态加载子命令
+    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/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/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/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/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/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/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/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/run_tests.py

@@ -1,13 +1,13 @@
-import subprocess,sys
+import subprocess
 import argparse
 import shutil
-from common.logger import *
+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):
@@ -69,18 +69,20 @@ class TestRunner:
         """直接存储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",
+            "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", "./allure_results"
+            "--alluredir", self.allure_results
         ]
         try:
             logger.info(f"run_pytest_tests Executing: {' '.join(cmd)}")
@@ -93,7 +95,7 @@ class TestRunner:
     def generate_allure_report(self) -> bool:
         """生成Allure报告"""
         try:
-            cmd = [self.allure_manager.allure_path, "generate", "./allure_results", "-o", self.args.report_dir, "--clean"]
+            cmd = [self.allure_manager.allure_path, "generate", self.allure_results, "-o", self.args.report_dir, "--clean"]
             subprocess.run(
                 cmd,
                 check=True,
@@ -113,7 +115,6 @@ class TestRunner:
             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()
@@ -125,7 +126,8 @@ class TestRunner:
         self._handle_allure_report()
         logger.info(f"http://localhost:{self.args.port}")
         return 0
-def main():
+
+if __name__ == "__main__":
     try:
         parser = argparse.ArgumentParser(description="Run tests with Allure reporting")
         parser.add_argument("--env", required=True, help="Test environment")
@@ -142,6 +144,4 @@ def main():
         exit(1)
     except Exception as e:
         logger.error(f"Unexpected error: {e}", exc_info=True)
-        exit(1) 
-if __name__ == "__main__":
-     main()
+        exit(1)  

{WebsocketTest-1.0.3.dist-info → websockettest-1.0.4.dist-info}/METADATA

@@ -1,14 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.3
+Version: 1.0.4
 Summary: websocket api autotest
 Author: chencheng
 Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-Requires-Dist: allure-python-commons==2.13.5
+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.dist-info/RECORD

@@ -0,0 +1,22 @@
+WebsocketTest/__init__.py,sha256=u71SAVmbgsyp0K21kilo7pIDgeyxsaHAi93clC0OIPQ,556
+WebsocketTest/cli.py,sha256=-33enBQWpq6S7eniXI1E-QHg2aoTEFfR7ZjksU-RYpI,975
+WebsocketTest/conftest.py,sha256=y2_2961mhCYSRMp5X9xLq3nOmRzaTSgD3GDdrlTqxn4,1885
+WebsocketTest/run_tests.py,sha256=y3Mwe1_LAKlBOzu_A-rOiRTAfVWY6vuyqrVD1XExY9M,5909
+WebsocketTest/caseScript/Aqua.py,sha256=N5ZroovGHAC0DqpXC1RTJNgHhRRmL-2WoJn7M4edOVo,7447
+WebsocketTest/caseScript/Gateway.py,sha256=8CydLZ8zTPwoYlPvp0NUTZWhX-8Y6--oDNKnvKDK20g,11749
+WebsocketTest/caseScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+WebsocketTest/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+WebsocketTest/commands/startproject.py,sha256=xTL6Tct8J8Ks6QD2VrQkNAWGhyv1UEMBuh2gmKCi3d0,909
+WebsocketTest/commands/test.py,sha256=T_yB_enbLdtiTlDgJ78BdbIxjddw_5RqnBUrwBYtpkg,738
+WebsocketTest/common/Assertion.py,sha256=Kd86Dr6CkPGHN4747T4doyZjklhEFaQ14WCJxuN59IU,5229
+WebsocketTest/common/WSBaseApi.py,sha256=H9l7xys_OIZ7Kzh9PQU-721zXgKdgrlQRvfSyPPSPiw,4024
+WebsocketTest/common/WebSocketApi.py,sha256=Oa0DmTm7k8J8IF28pA9HcmunR2Qz4pQKH_O4zjedw4c,2757
+WebsocketTest/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+WebsocketTest/common/assertUtils.py,sha256=poyL6J_WXb2BJvaABCILfiWHN7gHSTRcMWvpjk224yU,4713
+WebsocketTest/common/logger.py,sha256=B7jjPd5miAYorveHUEGW8xKxUNlJzKlVug0rKWRK3p0,783
+WebsocketTest/common/utils.py,sha256=jaNxKQjQCtIdN6VuFJQ22TWjMuMqN2CHrweE0GspQT8,8720
+websockettest-1.0.4.dist-info/METADATA,sha256=9WbRF8pnKr04t1wwd3jcUp4nIsdSUhIPEgeyDLZXf4g,420
+websockettest-1.0.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+websockettest-1.0.4.dist-info/entry_points.txt,sha256=9-0RmZ0nVgfDKaDFyk5xv8arp_us-7w5Negvis1CvYc,46
+websockettest-1.0.4.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
+websockettest-1.0.4.dist-info/RECORD,,

{WebsocketTest-1.0.3.dist-info → websockettest-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

websockettest-1.0.4.dist-info/entry_points.txt

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

WebsocketTest/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

WebsocketTest-1.0.3.dist-info/RECORD

@@ -1,21 +0,0 @@
-WebsocketTest/__init__.py,sha256=u71SAVmbgsyp0K21kilo7pIDgeyxsaHAi93clC0OIPQ,556
-WebsocketTest/cli.py,sha256=Y8lQ_V5blKxNg-Q9PeuPu7zasMNDPmry9g4KXnliDfk,1636
-WebsocketTest/conftest.py,sha256=y2_2961mhCYSRMp5X9xLq3nOmRzaTSgD3GDdrlTqxn4,1885
-WebsocketTest/run_tests.py,sha256=cRKvcQGBZG-1XkeoSMeCU8TI76FunrS2jkx6COx91_o,5776
-WebsocketTest/caseScript/Aqua.py,sha256=zr1mURYGikzzJDsx2lwdH9m_ENlJzH3vDvepsfwhfdg,7405
-WebsocketTest/caseScript/Gateway.py,sha256=D_oVhhKGFA3FdFblg_YmUj2HhlPNI3kht9LqHnSuNZA,11723
-WebsocketTest/caseScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-WebsocketTest/common/Assertion.py,sha256=xMesYiZY6FSf7_Zf6BIXGl9a2Prx-blRYGK2zKQy81M,5215
-WebsocketTest/common/WSBaseApi.py,sha256=-zDpMsaF4ugVKUpzDwbs6l9DBvlh2uw1oJGY64fk6fY,3982
-WebsocketTest/common/WebSocketApi.py,sha256=JpgX1qAA8skh_t9hLDmgEx6KugewF284u2cjrQkbLnI,2743
-WebsocketTest/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-WebsocketTest/common/assertUtils.py,sha256=xJvjm0QDIxUHIZm96-2sKkDUWzPQHaOJB9x9eSLlIoU,4699
-WebsocketTest/common/logger.py,sha256=B7jjPd5miAYorveHUEGW8xKxUNlJzKlVug0rKWRK3p0,783
-WebsocketTest/common/utils.py,sha256=5NrU_cXzpzTYSI38LZe4IjJe3HxNB64rtrXZcf3Vixs,8706
-WebsocketTest/testcase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-WebsocketTest/testcase/test_all.py,sha256=mdfivt5vmfcn_4LZVcQ1KTH0n69gKxd_Id-DCapGlu4,198
-WebsocketTest-1.0.3.dist-info/METADATA,sha256=TOfnxrmuLy4hqPkXk_9d5w-94RuyYqC4r3ecSH0X-Sg,378
-WebsocketTest-1.0.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-WebsocketTest-1.0.3.dist-info/entry_points.txt,sha256=7ppZml2d-BVAurDYhw301dOBU8wDgQrtTNlkJNGSc_Q,59
-WebsocketTest-1.0.3.dist-info/top_level.txt,sha256=2iF1gZSbXLjVFOe5ZKQiCLC1FzAwhcQUM88yGi-vrCU,14
-WebsocketTest-1.0.3.dist-info/RECORD,,

WebsocketTest-1.0.3.dist-info/entry_points.txt

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