WebsocketTest 1.0.1__tar.gz → 1.0.3__tar.gz

{WebsocketTest-1.0.1 → WebsocketTest-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WebsocketTest
-Version: 1.0.1
+Version: 1.0.3
 Summary: websocket api autotest
 Author: chencheng
 Requires-Python: >=3.10

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

@@ -0,0 +1,56 @@
+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)
+
+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()
+    
+    # 打印调试信息
+    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()
+if __name__ == "__main__":
+    main()

WebsocketTest-1.0.3/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.3/WebsocketTest/run_tests.py

@@ -0,0 +1,147 @@
+import subprocess,sys
+import argparse
+import shutil
+from common.logger import *
+import time
+import webbrowser
+from urllib.request import urlopen
+from urllib.error import URLError
+
+logger = logging.getLogger('run_tests')
+
+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)
+      
+    def run_pytest_tests(self) -> bool:
+        """执行pytest测试"""
+        case = self.args.service.split('_')[0]
+        cmd = [
+            "pytest",
+            "-m", case,
+            "--env", self.args.env,
+            "--app", self.args.app,
+            "--service", self.args.service,
+            "--project", self.args.project,
+            "--alluredir", "./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", "./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
+def 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) 
+if __name__ == "__main__":
+     main()

{WebsocketTest-1.0.1 → WebsocketTest-1.0.3}/WebsocketTest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WebsocketTest
-Version: 1.0.1
+Version: 1.0.3
 Summary: websocket api autotest
 Author: chencheng
 Requires-Python: >=3.10

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

@@ -0,0 +1,25 @@
+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/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/testcase/__init__.py
+WebsocketTest/testcase/test_all.py

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

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

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

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

{WebsocketTest-1.0.1 → WebsocketTest-1.0.3}/setup.py

@@ -3,10 +3,10 @@ from setuptools import find_packages, setup
 
 setup(
     name="WebsocketTest",
-    version="1.0.1",
+    version="1.0.3",
     author='chencheng',
     python_requires=">=3.10",
-    packages=find_packages(exclude=["allure_report", "logs", "allure_results",  "config", "data"]),
+    packages=find_packages(exclude=["WebsocketTest.allure_report", "WebsocketTest.logs", "WebsocketTest.allure_results",  "WebsocketTest.config", "WebsocketTest.data"]),
     description="websocket api autotest",
     # long_description=open('README.md','r',encoding='utf-8').read(),
     long_description_content_type='text/markdown',
@@ -20,7 +20,7 @@ setup(
     ],
     entry_points={
         'console_scripts': [
-            'wsrun=WebsocketTest.run_tests:main'
+            'wsrun=WebsocketTest.cli:main_run_alias'
         ]
     }
 )

WebsocketTest-1.0.1/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.1/WebsocketTest.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-wsrun = WebsocketTest.run_tests:main

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

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