PyPI - hardpy - Versions diffs - 0.11.2__py3-none-any.whl → 0.12.1__py3-none-any.whl - Mend

hardpy 0.11.2py3-none-any.whl → 0.12.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (56) hide show

hardpy/hardpy_panel/frontend/dist/index.html CHANGED Viewed

@@ -1 +1,45 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HardPy Operator Panel</title><script defer="defer" src="/static/js/main.fb8b84a3.js"></script><link href="/static/css/main.e8a862f1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>HardPy Operator Panel</title>
+    <script type="module" crossorigin src="/assets/index-Bl_IX0Up.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BwCQzehg.css">
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

hardpy/pytest_hardpy/db/base_store.py CHANGED Viewed

@@ -100,6 +100,7 @@ class BaseStore(BaseConnector):
                     DF.NAME: None,
                     DF.TIMEZONE: None,
                     DF.LOCATION: None,
+                    DF.NUMBER: None,
                     DF.DRIVERS: {},
                     DF.INFO: {},
                 },
@@ -120,6 +121,7 @@ class BaseStore(BaseConnector):
             DF.NAME: None,
             DF.TIMEZONE: None,
             DF.LOCATION: None,
+            DF.NUMBER: None,
             DF.DRIVERS: {},
             DF.INFO: {},
         }

hardpy/pytest_hardpy/db/const.py CHANGED Viewed

@@ -38,3 +38,4 @@ class DatabaseField(str, Enum):
     ALERT = "alert"
     OPERATOR_DATA = "operator_data"
     DIALOG = "dialog"
+    NUMBER = "number"

hardpy/pytest_hardpy/db/schema/v1.py CHANGED Viewed

@@ -188,7 +188,8 @@ class TestStand(BaseModel):
             "port": 8000
           }
         },
-        "location": "Belgrade_1"
+        "location": "Belgrade_1",
+        "number": 2
       }
     }
     ```
@@ -202,6 +203,7 @@ class TestStand(BaseModel):
     drivers: dict = {}
     info: dict = {}
     location: str | None = None
+    number: int | None = None
 class OperatorData(BaseModel):
@@ -261,7 +263,8 @@ class ResultStateStore(IBaseResult):
             "port": 8000
           }
         },
-        "location": "Belgrade_1"
+        "location": "Belgrade_1",
+        "number": 2
       },
       "operator_msg": {
         "msg": "Operator message",
@@ -363,7 +366,8 @@ class ResultRunStore(IBaseResult):
             "port": 8000
           }
         },
-        "location": "Belgrade_1"
+        "location": "Belgrade_1",
+        "number": 2
       },
       "artifact": {},
       "modules": {

hardpy/pytest_hardpy/plugin.py CHANGED Viewed

@@ -47,6 +47,7 @@ if __debug__:
     disable_warnings(InsecureRequestWarning)
 def pytest_addoption(parser: Parser) -> None:
     """Register argparse-style options."""
     con_data = ConnectionData()
@@ -123,6 +124,7 @@ class HardpyPlugin:
         self._post_run_functions: list[Callable] = []
         self._dependencies = {}
         self._tests_name: str = ""
+        self._is_critical_not_passed = False
         if system() == "Linux":
             signal.signal(signal.SIGTERM, self._stop_handler)
@@ -160,12 +162,13 @@ class HardpyPlugin:
         config.addinivalue_line("markers", "module_name")
         config.addinivalue_line("markers", "dependency")
         config.addinivalue_line("markers", "attempt")
+        config.addinivalue_line("markers", "critical")
         # must be init after config data is set
         try:
             self._reporter = HookReporter(bool(is_clear_database))
         except RuntimeError as exc:
-            exit(str(exc), 1)
+            exit(str(exc), ExitCode.INTERNAL_ERROR)
     def pytest_sessionfinish(self, session: Session, exitstatus: int) -> None:
         """Call at the end of test session."""
@@ -206,7 +209,7 @@ class HardpyPlugin:
                 node_info = NodeInfo(item)
             except ValueError as exc:
                 error_msg = f"Error creating NodeInfo for item: {item}. {exc}"
-                exit(error_msg, 1)
+                exit(error_msg, ExitCode.NO_TESTS_COLLECTED)
             self._init_case_result(node_info.module_id, node_info.case_id)
             if node_info.module_id not in nodes:
@@ -240,7 +243,7 @@ class HardpyPlugin:
             except StandCloudError as exc:
                 msg = str(exc)
                 self._reporter.set_alert(msg)
-                exit(msg)
+                exit(msg, ExitCode.INTERNAL_ERROR)
             try:
                 sc_connector.healthcheck()
             except Exception:  # noqa: BLE001
@@ -251,7 +254,7 @@ class HardpyPlugin:
                 )
                 self._reporter.set_alert(msg)
                 self._reporter.update_db_by_doc()
-                exit(msg)
+                exit(msg, ExitCode.INTERNAL_ERROR)
         # testrun entrypoint
         self._reporter.start()
@@ -267,7 +270,7 @@ class HardpyPlugin:
         node_info = NodeInfo(item)
         status = TestStatus.RUN
-        is_skip_test = self._is_skip_test(node_info)
+        is_skip_test = self._is_critical_not_passed or self._is_skip_test(node_info)
         self._reporter.set_module_start_time(node_info.module_id)
         if not is_skip_test:
             self._reporter.set_case_start_time(node_info.module_id, node_info.case_id)
@@ -287,11 +290,7 @@ class HardpyPlugin:
     def pytest_runtest_call(self, item: Item) -> None:
         """Call the test item."""
         node_info = NodeInfo(item)
-        self._reporter.set_case_attempt(
-            node_info.module_id,
-            node_info.case_id,
-            1,
-        )
+        self._reporter.set_case_attempt(node_info.module_id, node_info.case_id, 1)
         self._reporter.update_db_by_doc()
     def pytest_runtest_makereport(self, item: Item, call: CallInfo) -> None:
@@ -304,6 +303,9 @@ class HardpyPlugin:
         module_id = node_info.module_id
         case_id = node_info.case_id
+        if node_info.critical:
+            self._is_critical_not_passed = True
         # first attempt was in pytest_runtest_call
         for current_attempt in range(2, attempt + 1):
             # add pause between attempts to verify STOP condition
@@ -317,6 +319,7 @@ class HardpyPlugin:
             try:
                 item.runtest()
                 call.excinfo = None
+                self._is_critical_not_passed = False
                 self._reporter.set_case_status(module_id, case_id, TestStatus.PASSED)
                 break
             except AssertionError:
@@ -340,11 +343,7 @@ class HardpyPlugin:
         module_id = Path(report.fspath).stem
         case_id = report.nodeid.rpartition("::")[2]
-        self._reporter.set_case_status(
-            module_id,
-            case_id,
-            TestStatus(report.outcome),
-        )
+        self._reporter.set_case_status(module_id, case_id, TestStatus(report.outcome))
         # update case stop_time in non-skipped tests or user-skipped tests
         if report.skipped is False or is_skipped_by_plugin is False:
             self._reporter.set_case_stop_time(module_id, case_id)
@@ -376,7 +375,7 @@ class HardpyPlugin:
     # Not hooks
     def _stop_handler(self, signum: int, frame: Any) -> None:  # noqa: ANN401, ARG002
-        exit("Tests stopped by user")
+        exit("Tests stopped by user", ExitCode.INTERRUPTED)
     def _init_case_result(self, module_id: str, case_id: str) -> None:
         if self._results.get(module_id) is None:
@@ -425,6 +424,8 @@ class HardpyPlugin:
             # update module statuses
             self._results[module_id]["module_status"] = TestStatus.STOPPED
             self._reporter.set_module_status(module_id, TestStatus.STOPPED)
+            if self._reporter.get_module_start_time(module_id):
+                self._reporter.set_module_stop_time(module_id)
             # update case statuses
             for module_key, module_value in module_data.items():
@@ -440,6 +441,9 @@ class HardpyPlugin:
                         case_id,
                         TestStatus.STOPPED,
                     )
+                    if self._reporter.get_case_start_time(module_id, case_id):
+                        self._reporter.set_case_stop_time(module_id, case_id)
         self._reporter.update_db_by_doc()
     def _decode_assertion_msg(
@@ -482,36 +486,40 @@ class HardpyPlugin:
     def _is_skip_test(self, node_info: NodeInfo) -> bool:
         """Is need to skip a test because it depends on another test."""
-        is_dependency_test_exist = self._dependencies.get(
+        dependency_tests = self._dependencies.get(
             TestDependencyInfo(node_info.module_id, node_info.case_id),
         )
-        is_dependency_test_failed = False
-        if is_dependency_test_exist:
+        is_skip = False
+        if dependency_tests:
             wrong_status = {TestStatus.FAILED, TestStatus.SKIPPED, TestStatus.ERROR}
-            module_id, case_id = is_dependency_test_exist
-            if case_id is not None:
-                is_dependency_test_failed = (
-                    self._results[module_id][case_id] in wrong_status
-                )
-            else:
-                result_set = set(self._results[module_id].values())
-                is_dependency_test_failed = any(
-                    status in wrong_status for status in result_set
-                )
-        return bool(is_dependency_test_exist and is_dependency_test_failed)
+            for dependency_test in dependency_tests:
+                module_id, case_id = dependency_test
+                module_data = self._results[module_id]
+                # case result is the reason for the skipping
+                if case_id is not None and module_data[case_id] in wrong_status:  # noqa: SIM114
+                    is_skip = True
+                    break
+                # module result is the reason for the skipping
+                elif case_id is None and module_data["module_status"] in wrong_status:  # noqa: RET508
+                    is_skip = True
+                    break
+            if is_skip and node_info.critical is True:
+                self._is_critical_not_passed = True
+        return is_skip
     def _add_dependency(self, node_info: NodeInfo, nodes: dict) -> None:
-        dependency = node_info.dependency
-        if dependency is None or dependency == "":
+        dependencies = node_info.dependency
+        if dependencies is None:
             return
-        module_id, case_id = dependency
-        if module_id not in nodes:
-            error_message = f"Error: Module dependency '{dependency}' not found."
-            exit(error_message, 1)
-        elif case_id not in nodes[module_id] and case_id is not None:
-            error_message = f"Error: Case dependency '{dependency}' not found."
-            exit(error_message, 1)
-        self._dependencies[
-            TestDependencyInfo(node_info.module_id, node_info.case_id)
-        ] = dependency
+        for dependency in dependencies:
+            module_id, case_id = dependency
+            # incorrect module id in dependency
+            if module_id not in nodes:
+                continue
+            # incorrect case id in dependency
+            if case_id not in nodes[module_id] and case_id is not None:
+                continue
+            test_key = TestDependencyInfo(node_info.module_id, node_info.case_id)
+            if test_key not in self._dependencies:
+                self._dependencies[test_key] = set()
+            self._dependencies[test_key].add(dependency)

hardpy/pytest_hardpy/pytest_call.py CHANGED Viewed

@@ -23,8 +23,10 @@ from hardpy.pytest_hardpy.utils import (
     DuplicateSerialNumberError,
     DuplicateTestStandLocationError,
     DuplicateTestStandNameError,
+    DuplicateTestStandNumberError,
     HTMLComponent,
     ImageComponent,
+    TestStandNumberError,
 )
@@ -138,6 +140,9 @@ def set_stand_location(location: str) -> None:
     Args:
         location (str): test stand location
+    Raises:
+        DuplicateTestStandLocationError: if test stand location is already set
     """
     reporter = RunnerReporter()
     key = reporter.generate_key(DF.TEST_STAND, DF.LOCATION)
@@ -147,6 +152,26 @@ def set_stand_location(location: str) -> None:
     reporter.update_db_by_doc()
+def set_stand_number(number: int) -> None:
+    """Add test stand number to document.
+    Args:
+        number (int): test stand number (non negative integer)
+    Raises:
+        DuplicateTestStandNumberError: if stand number is already set
+        TestStandNumberError: if stand number is incorrect (negative or non integer)
+    """
+    reporter = RunnerReporter()
+    key = reporter.generate_key(DF.TEST_STAND, DF.NUMBER)
+    if not isinstance(number, int) or number < 0:
+        raise TestStandNumberError
+    if reporter.get_field(key):
+        raise DuplicateTestStandNumberError
+    reporter.set_doc_value(key, number)
+    reporter.update_db_by_doc()
 def set_message(msg: str, msg_key: str | None = None) -> None:
     """Add or update message in current test.

hardpy/pytest_hardpy/reporter/hook_reporter.py CHANGED Viewed

@@ -202,6 +202,24 @@ class HookReporter(BaseReporter):
         """
         self.set_doc_value(DF.ALERT, alert, statestore_only=True)
+    def get_module_start_time(self, module_id: str) -> int:
+        """Get module start time.
+        Returns:
+            int: module time
+        """
+        key = self.generate_key(DF.MODULES, module_id, DF.START_TIME)
+        return self._statestore.get_field(key)
+    def get_case_start_time(self, module_id: str, case_id: str) -> int:
+        """Get case start time.
+        Returns:
+            int: module time
+        """
+        key = self.generate_key(DF.MODULES, module_id, DF.CASES, case_id, DF.START_TIME)
+        return self._statestore.get_field(key)
     def update_node_order(self, nodes: dict) -> None:
         """Update node order.

hardpy/pytest_hardpy/result/report_reader/stand_cloud_reader.py CHANGED Viewed

@@ -36,17 +36,41 @@ class StandCloudReader:
         self._verify_ssl = not __debug__
         self._sc_connector = sc_connector
-    def test_run(self, run_id: str) -> Response:
+    def request(self, endpoint: str, params: dict[str, Any] | None = None) -> Response:
+        """Get data from endpoint.
+        Args:
+            endpoint (str): endpoint address.
+            params (dict[str, Any] | None, optional): endpoint parameters.
+                Defaults to None.
+        Returns:
+            Response: endpoint data.
+        """
+        return self._request(endpoint=endpoint, params=params)
+    def test_run(
+        self,
+        run_id: str | None = None,
+        params: dict[str, Any] | None = None,
+    ) -> Response:
         """Get run data from '/test_run' endpoint.
         Args:
             run_id (str): UUIDv4 test run identifier.
                 Example: "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+            params (dict[str, Any] | None, optional): test_run parameters.
+                Defaults to None.
         Returns:
             Response: test run data.
         """
-        return self._request(endpoint=f"test_run/{run_id}")
+        if run_id is not None and params is not None:
+            msg = "run_id and params are mutually exclusive"
+            raise ValueError(msg)
+        if run_id is not None:
+            return self._request(endpoint=f"test_run/{run_id}")
+        return self._request(endpoint="test_run", params=params)
     def tested_dut(self, params: dict[str, Any]) -> Response:
         """Get tested DUT's data from '/tested_dut' endpoint.

hardpy/pytest_hardpy/utils/__init__.py CHANGED Viewed

@@ -20,7 +20,9 @@ from hardpy.pytest_hardpy.utils.exception import (
     DuplicateSerialNumberError,
     DuplicateTestStandLocationError,
     DuplicateTestStandNameError,
+    DuplicateTestStandNumberError,
     ImageError,
+    TestStandNumberError,
     WidgetInfoError,
 )
 from hardpy.pytest_hardpy.utils.machineid import machine_id
@@ -37,6 +39,7 @@ __all__ = [
     "DuplicateSerialNumberError",
     "DuplicateTestStandLocationError",
     "DuplicateTestStandNameError",
+    "DuplicateTestStandNumberError",
     "HTMLComponent",
     "ImageComponent",
     "ImageError",
@@ -47,6 +50,7 @@ __all__ = [
     "RadiobuttonWidget",
     "SingletonMeta",
     "StepWidget",
+    "TestStandNumberError",
     "TestStatus",
     "TextInputWidget",
     "WidgetInfoError",

hardpy/pytest_hardpy/utils/exception.py CHANGED Viewed

@@ -37,6 +37,20 @@ class DuplicateTestStandLocationError(HardpyError):
         super().__init__(self.__doc__)  # type: ignore
+class DuplicateTestStandNumberError(HardpyError):
+    """The test stand number has already been determined."""
+    def __init__(self) -> None:
+        super().__init__(self.__doc__)  # type: ignore
+class TestStandNumberError(HardpyError):
+    """The test stand number is in the incorrect format."""
+    def __init__(self) -> None:
+        super().__init__(self.__doc__)  # type: ignore
 class WidgetInfoError(HardpyError):
     """The widget info is not correct."""

hardpy/pytest_hardpy/utils/node_info.py CHANGED Viewed

@@ -43,6 +43,8 @@ class NodeInfo:
         self._attempt = self._get_attempt(item.own_markers)
+        self._critical = self._get_critical(item.own_markers + item.parent.own_markers)
         self._module_id = Path(item.parent.nodeid).stem  # type: ignore
         self._case_id = item.name
@@ -83,11 +85,11 @@ class NodeInfo:
         return self._case_name
     @property
-    def dependency(self) -> TestDependencyInfo | str:
+    def dependency(self) -> list[TestDependencyInfo] | None:
         """Get dependency information.
         Returns:
-            TestDependencyInfo | str: Parsed dependency information.
+            list[TestDependencyInfo] | None: Dependency information
         """
         return self._dependency
@@ -100,6 +102,15 @@ class NodeInfo:
         """
         return self._attempt
+    @property
+    def critical(self) -> bool:
+        """Get critical status.
+        Returns:
+            bool: critical status
+        """
+        return self._critical
     def _get_human_name(self, markers: list[Mark], marker_name: str) -> str:
         """Get human name from markers.
@@ -115,7 +126,25 @@ class NodeInfo:
                 return marker.args[0]
         return ""
-    def _get_dependency_info(self, markers: list[Mark]) -> TestDependencyInfo | str:
+    def _get_human_names(self, markers: list[Mark], marker_name: str) -> list[str]:
+        """Get human names from markers.
+        Args:
+            markers (list[Mark]): item markers list
+            marker_name (str): marker name
+        Returns:
+            list[str]: human names by user
+        """
+        names = []
+        for marker in markers:
+            if marker.name == marker_name and marker.args:
+                names.append(marker.args[0])  # noqa: PERF401
+        return names
+    def _get_dependency_info(
+        self, markers: list[Mark],
+    ) -> list[TestDependencyInfo] | None:
         """Extract and parse dependency information.
         Args:
@@ -123,17 +152,22 @@ class NodeInfo:
             marker_name (str): marker name
         Returns:
-            TestDependencyInfo | str | None: Parsed dependency information.
+            list[TestDependencyInfo] | None: Dependency information
         """
-        dependency_value = self._get_human_name(markers, "dependency")
-        dependency_data = re.search(r"(\w+)::(\w+)", dependency_value)
-        if dependency_data:
-            return TestDependencyInfo(*dependency_data.groups())
-        elif re.search(r"^\w+$", dependency_value):  # noqa: RET505
-            return TestDependencyInfo(dependency_value, None)
-        elif dependency_data is None and dependency_value == "":
-            return ""
-        raise ValueError
+        dependency_value = self._get_human_names(markers, "dependency")
+        dependencies = []
+        for dependency in dependency_value:
+            dependency_data = re.search(r"(\w+)::(\w+)", dependency)
+            if dependency_data:
+                dependencies.append(TestDependencyInfo(*dependency_data.groups()))
+            elif re.search(r"^\w+$", dependency):
+                dependencies.append(TestDependencyInfo(dependency, None))
+            elif not dependency:
+                continue
+            else:
+                error_msg = f"Invalid dependency format: {dependency}"
+                raise ValueError(error_msg)
+        return dependencies if dependencies else None
     def _get_attempt(self, markers: list[Mark]) -> int:
         """Get the number of attempts.
@@ -152,3 +186,14 @@ class NodeInfo:
             msg = "The 'attempt' marker value must be a positive integer."
             raise ValueError(msg)
         return attempt
+    def _get_critical(self, markers: list[Mark]) -> bool:
+        """Check if test or module is marked as critical.
+        Args:
+            markers (list[Mark]): item markers list
+        Returns:
+            bool: True if test or module is critical, False otherwise
+        """
+        return any(marker.name == "critical" for marker in markers)

{hardpy-0.11.2.dist-info → hardpy-0.12.1.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hardpy
-Version: 0.11.2
+Version: 0.12.1
 Summary: HardPy library for device testing
 Project-URL: Homepage, https://github.com/everypinio/hardpy/
 Project-URL: Documentation, https://everypinio.github.io/hardpy/
@@ -48,6 +48,8 @@ Provides-Extra: dev
 Requires-Dist: mypy>=1.11.0; extra == 'dev'
 Requires-Dist: ruff==0.8.0; extra == 'dev'
 Requires-Dist: wemake-python-styleguide>=0.19.2; extra == 'dev'
+Provides-Extra: tests
+Requires-Dist: psutil~=7.0.0; extra == 'tests'
 Description-Content-Type: text/markdown
 <h1 align="center">

hardpy 0.11.2__py3-none-any.whl → 0.12.1__py3-none-any.whl

hardpy 0.11.2py3-none-any.whl → 0.12.1py3-none-any.whl