WebsocketTest 1.0.4__tar.gz → 1.0.5__tar.gz

{websockettest-1.0.4 → websockettest-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.4
+Version: 1.0.5
 Summary: websocket api autotest
 Author: chencheng
 Requires-Python: >=3.10

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

@@ -4,9 +4,6 @@ from urllib.parse import quote_plus
 from WebsocketTest.common import WSBaseApi
 from WebsocketTest.common.WSBaseApi import WSBaseApi
 
-
-
-
 class ApiTestRunner(WSBaseApi):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -145,7 +142,7 @@ class ApiTestRunner(WSBaseApi):
                 msg = json.loads(_msg)
                 code = safe_get(msg, ["header","code"])
                 if code != 0:
-                    logging.error(f'请求错误: {code}, {msg}')
+                    logger.error(f'请求错误: {code}, {msg}')
                     break
                 else:
                     answer = safe_get(msg, ["payload","results","text","intent","answer"])
@@ -159,7 +156,7 @@ class ApiTestRunner(WSBaseApi):
                         return
                         
             except Exception as e:
-                logging.error(f"error in handle_v1_chain :{e}")
+                logger.error(f"error in handle_v1_chain :{e}")
                 break
  
     

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

@@ -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:
@@ -81,10 +81,10 @@ class ApiTestRunner(WSBaseApi):
                         elif status == 2:
                             break
                 else:
-                    logging.error(f"返回结果错误：{response_data['header']['message']}")
+                    logger.error(f"返回结果错误：{response_data['header']['message']}")
                     break
             except Exception as e:
-                logging.error(f"Error in processing message: {e}")
+                logger.error(f"Error in processing message: {e}")
                 break
     # @exception_decorator
     async def handle_v1_chain(self, ws):
@@ -113,7 +113,7 @@ class ApiTestRunner(WSBaseApi):
                         self.response = json.loads(data['content'])
                         return
             except Exception as e:
-                logging.error(f"error in handle_v1_chain :{e}")
+                logger.error(f"error in handle_v1_chain :{e}")
                 break
    
     def build_params(self,chain=None):

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest/cli.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from importlib import import_module
 
 def main():
-    parser = argparse.ArgumentParser(description="ws CLI")
+    parser = argparse.ArgumentParser(description="WebSocket Test CLI")
     subparsers = parser.add_subparsers(dest='command', required=True)
     
     # 动态加载子命令

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest/commands/startproject.py

@@ -13,7 +13,7 @@ def configure_parser(parser):
 
 def execute(args):
     """执行项目创建"""
-    template_dir = Path(__file__).parent.parent / "templates" / args.template
+    template_dir = Path(__file__).parent.parent.parent / "templates" / args.template
     target_dir = Path.cwd() / args.project_name
     
     if target_dir.exists():

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest/commands/test.py

@@ -10,6 +10,7 @@ def configure_parser(parser):
     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")
+    parser.add_argument("--testcase", required=False, help='Specify the test case to run (e.g., "testcase/test_all.py::TestAqua::test_api[case_suite0]"')
 
 def execute(args):
     """执行test"""

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

@@ -49,9 +49,10 @@ class BaseApiTest:
                 f"无法加载 {module_path}.ApiTestRunner，"
                 "请检查模块路径和类命名是否符合规范"
             ) from e
+    
 
     @pytest.mark.parametrize('case_suite', gen_case_suite(CASE_PATH))
-    def test_api(self, case_suite, setup_env):
+    def test(self, case_suite, setup_env):
         """测试用例执行模板"""
         try:
             # 1. 合并参数

websockettest-1.0.5/WebsocketTest/common/logger.py

@@ -0,0 +1,14 @@
+import logging
+
+# 配置全局日志记录设置
+# 配置日志记录
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s.%(msecs)03d - %(levelname)s - %(name)s - %(message)s',
+    datefmt='%H:%M:%S',
+    handlers=[
+        logging.StreamHandler(),  # 输出到控制台
+    ]
+)
+# 创建一个记录器实例
+logger = logging.getLogger()

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

@@ -6,9 +6,8 @@ import string
 from datetime import datetime
 import email.utils
 from functools import wraps
-from WebsocketTest.common.logger import *
+from WebsocketTest.common.logger import logger
 from typing import Optional, Union, Literal
-import numpy as np
 def get_rfc1123_time():
         # 获取当前UTC时间
         now = datetime.utcnow()
@@ -208,7 +207,7 @@ def exception_decorator(func):
             function_name = func.__name__
             file_name = os.path.basename(func.__code__.co_filename)  # 提取文件名
             # 打印异常和函数名
-            logging.error( f"异常发生在文件 [{file_name}] 的函数 [{function_name}] 中: {str(e)}",
+            logger.error( f"异常发生在文件 [{file_name}] 的函数 [{function_name}] 中: {str(e)}",
                 exc_info=True  # 自动追加堆栈信息
                 )
             # 可选择再次抛出异常或进行其他处理

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest/conftest.py

@@ -56,8 +56,4 @@ def pytest_addoption(parser):
         action="store",
         default="vwa",
         help="Project name is required"
-    )
-
-
-
-
+    )

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest/run_tests.py

@@ -1,13 +1,12 @@
 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
+from WebsocketTest.common.logger import logger
 
 class AllureManager:
     def __init__(self, port: int = 8883):
@@ -28,7 +27,7 @@ class AllureManager:
         """启动Allure服务"""
         try:
             cmd = [self.allure_path, "open", report_dir, "-p", str(self.port)]
-            logger.info(f"start_server Executing: {' '.join(cmd)}")
+            # logger.info(f"start_server Executing: {' '.join(cmd)}")
             subprocess.Popen(
                 cmd,
                 stdout=subprocess.DEVNULL,
@@ -72,20 +71,23 @@ class TestRunner:
         self.allure_results = str(Path.cwd().joinpath("allure_results"))
 
     def run_pytest_tests(self) -> bool:
-        """执行pytest测试"""
-        case = self.args.service.split('_')[0]
-        
+        """执行pytest测试"""  
+        # 构建基础命令列表
         cmd = [
-            "pytest", str(Path.cwd().joinpath("testcase","test_all.py")),
-            "-m", case,
+            "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
         ]
+           # 添加可选测试路径（如果存在）
+        if hasattr(self.args, 'testcase') and self.args.testcase:
+            cmd.insert(1, self.args.testcase)
+        print(f"run_pytest_tests Executing: {' '.join(cmd)}")
         try:
-            logger.info(f"run_pytest_tests Executing: {' '.join(cmd)}")
+            # 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}")
@@ -101,7 +103,7 @@ class TestRunner:
                 check=True,
                 timeout=300
             )
-            logger.info(f"generate_allure_report Executing: {' '.join(cmd)}")
+            # 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:
@@ -136,6 +138,7 @@ if __name__ == "__main__":
         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")
+        parser.add_argument("--testcase", required=False, help='Specify the test case to run (e.g., "testcase/test_all.py::TestAqua::test_api[case_suite0]"')
         args = parser.parse_args()
         test_runner = TestRunner(args)
         exit(test_runner.run())

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebsocketTest
-Version: 1.0.4
+Version: 1.0.5
 Summary: websocket api autotest
 Author: chencheng
 Requires-Python: >=3.10

{websockettest-1.0.4 → websockettest-1.0.5}/WebsocketTest.egg-info/SOURCES.txt

@@ -19,7 +19,6 @@ 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-1.0.4 → websockettest-1.0.5}/setup.py

@@ -18,7 +18,7 @@ setup(
         'bdist_wheel': CustomBdistWheel
     },
     name="WebsocketTest",
-    version="1.0.4",
+    version="1.0.5",
     author='chencheng',
     python_requires=">=3.10",
     packages=find_packages(exclude=["WebsocketTest.allure_report", "WebsocketTest.logs", "WebsocketTest.allure_results",  "WebsocketTest.config", "WebsocketTest.data","WebsocketTest.testcase"]),
@@ -37,7 +37,7 @@ setup(
         ]
     }
 )
-import shutil
+# import shutil
 
-# 清理 .egg-info 文件夹
-shutil.rmtree('WebsocketTest.egg-info', ignore_errors=True)
+# # 清理 .egg-info 文件夹
+# shutil.rmtree('WebsocketTest.egg-info', ignore_errors=True)

websockettest-1.0.4/WebsocketTest/common/WebSocketApi.py

@@ -1,73 +0,0 @@
-import _thread as thread
-import logging
-import websocket  # 使用websocket_client
-from WebsocketTest.common.utils import *
-
-class WebSocketApi:
-    def __init__(self, url, request):
-        self.url = url
-        self.request = request
-        self.answer_text = ""
-        self.errcode = ""
-        self.response = {}
-        self.ws = None
-        
-    def on_error(self, ws, error):
-        """处理WebSocket错误"""
-        logging.error(f"### error: {error}")
-        self.errcode = str(error)
-        self.ws.close()
-
-    def on_close(self, ws, close_status_code, close_msg):
-        """处理WebSocket关闭"""
-        logging.info(f"### ws closed with status {close_status_code} and message {close_msg}")
-
-    def on_open(self, ws):
-        """处理WebSocket连接建立"""
-        thread.start_new_thread(self.run, (ws,))
-
-    def run(self, ws, *args):
-        """发送请求"""
-        ws.send(self.request)
-
-    def on_message(self, ws, message: str):
-        """处理WebSocket消息"""
-        try:
-            msg = json.loads(message)
-            code = safe_get(msg, ["header","code"])
-            if code != 0:
-                logging.error(f'请求错误: {code}, {msg}')
-                err_msg = safe_get(msg, ["header","message"])
-                self.errcode = f"{code}, error msg: {err_msg}"
-                self.ws.close()
-            else:
-                answer = safe_get(msg, ["payload","results","text","intent","answer"])
-                answerText = safe_get(answer, ["text"])
-                if answerText:
-                    self.answer_text += answerText
-                if msg['header']['status']=="2" or msg['header']['status']=="3":  # 返回结果接收完成
-                    if self.answer_text:
-                        answer["text"] = self.answer_text     
-                    self.response = msg
-                    self.ws.close()
-        except json.JSONDecodeError as e:
-            logging.error(f"JSON解码错误: {e}")
-            self.errcode = f"JSON解码错误: {e}"
-            self.ws.close()
-
-    def start(self):
-        """启动WebSocket客户端"""
-        websocket.enableTrace(False)
-        self.ws = websocket.WebSocketApp(self.url,
-                                        on_open=self.on_open,
-                                        on_error=self.on_error,
-                                        on_message=self.on_message,
-                                        on_close=self.on_close)
-        self.ws.run_forever()
-
-
-def main(Spark_url, request: str):
-    """主函数，启动WebSocket客户端并返回响应"""
-    client = WebSocketApi(Spark_url, request)
-    client.start()
-    return client.response

websockettest-1.0.4/WebsocketTest/common/logger.py

@@ -1,27 +0,0 @@
-import os
-import logging
-from datetime import datetime
-
-def configure_logging():
-    # 指定日志文件夹路径
-    log_dir = 'logs'
-    
-    # 创建日志文件夹（如果它不存在）
-    os.makedirs(log_dir, exist_ok=True)
-    
-    # 获取今天的日期，用于日志文件名
-    today_date = datetime.now().date()
-    
-    # 配置日志记录
-    logging.basicConfig(
-        level=logging.INFO,
-        format='%(asctime)s.%(msecs)03d - %(levelname)s - %(name)s - %(message)s',
-        datefmt='%H:%M:%S',
-        handlers=[
-            logging.StreamHandler(),  # 输出到控制台
-            logging.FileHandler(f'{log_dir}/{today_date}.log')  # 输出到文件
-        ]
-    )
-
-# 调用函数以配置日志记录
-configure_logging()