socx-cli 0.13.7__tar.gz → 0.13.8__tar.gz

{socx_cli-0.13.7 → socx_cli-0.13.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socx-cli
-Version: 0.13.7
+Version: 0.13.8
 Summary: System on chip verification and tooling infrastructure.
 Project-URL: Issues, https://github.com/sagikimhi/socx-cli/issues
 Project-URL: Homepage, https://sagikimhi.dev/socx-cli

{socx_cli-0.13.7 → socx_cli-0.13.8}/pyproject.toml

@@ -29,7 +29,7 @@ socx = 'socx.__main__:main'
 [project]
 name = "socx-cli"
 readme = "README.md"
-version = "0.13.7"
+version = "0.13.8"
 license = "Apache-2.0"
 authors = [{ name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" }]
 maintainers = [{ name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" }]

{socx_cli-0.13.7 → socx_cli-0.13.8}/socx/config/converters.py

@@ -310,8 +310,8 @@ class SymbolConverter(Converter[str | Lazy, Any]):
 
 class CommandConverter(
     Converter[
-        str | Lazy | sh.Command | click.Command | PluginModel,
-        str | Lazy | click.Command,
+        str | Lazy | BaseCommand | click.Command | PluginModel,
+        str | Lazy | click.Command | click.Group,
     ]
 ):
     """Turn module or script references into Rich Click commands."""
@@ -351,7 +351,7 @@ class CommandConverter(
     @overload
     def __call__(
         self,
-        value: sh.Command,
+        value: BaseCommand,
         *args: Any,
         **kwargs: Any,
     ) -> click.Command: ...
@@ -374,10 +374,10 @@ class CommandConverter(
     @_validate
     def __call__(
         self,
-        value: str | Lazy | sh.Command | click.Command | PluginModel,
+        value: str | Lazy | BaseCommand | click.Command | PluginModel,
         *args: Any,
         **kwargs: Any,
-    ) -> Lazy | click.Command | click.Group:
+    ) -> str | Lazy | click.Command | click.Group:
         """Build a Click command from dotted paths or reuse existing ones."""
         if isinstance(value, Lazy):
             if value.casting is self:
@@ -401,9 +401,9 @@ class CommandConverter(
             nonlocal value
 
             if TYPE_CHECKING:
-                value = cast(str | sh.Command | PluginModel, value)
+                value = cast(str | BaseCommand | PluginModel, value)
 
-            if isinstance(value, sh.Command):
+            if isinstance(value, str | BaseCommand):
                 return self._run_shell_script(value, *args)
 
             if isinstance(value, PluginModel) and value.is_script():

{socx_cli-0.13.7 → socx_cli-0.13.8}/socx/regression/test.py

@@ -10,6 +10,7 @@ import signal
 import asyncio as aio
 import logging
 from textwrap import dedent
+from typing import Any
 from enum import IntEnum, StrEnum, auto
 from pathlib import Path
 from subprocess import CalledProcessError
@@ -27,7 +28,6 @@ from pydantic import (
     computed_field,
 )
 from anyio.abc import Process, TaskStatus
-from anyio.to_thread import run_sync
 
 from socx.patterns import Visitor
 from socx.core.schema import Script, DirectoryPath
@@ -96,6 +96,22 @@ class TestBase(BaseModel):
         """,
     )
 
+    fresh_env: bool = Field(
+        default=False,
+        description="""
+            Whether or not to execute the test in a fresh environment.
+
+            A fresh environment is an environment with no environment
+            variables defined other than those defined in the ``env`` field.
+
+            A non-fresh environment will contain all environment variables of
+            the current process, as well as any variables defined in the
+            ``env`` field.
+
+            If left unspecified, defaults to False.
+        """,
+    )
+
     model_config = ConfigDict(
         from_attributes=True,
         arbitrary_types_allowed=True,
@@ -112,6 +128,12 @@ class TestBase(BaseModel):
     _output_dir: Path | None = PrivateAttr(None)
     _termination_requested: bool = PrivateAttr(False)
 
+    def model_post_init(self, context: Any) -> None:
+        if not self.fresh_env:
+            env = os.environ.copy()
+            env.update(self.env)
+            self.env = env
+
     @computed_field
     @property
     def status(self) -> TestStatus:
@@ -301,7 +323,7 @@ class TestBase(BaseModel):
             return
 
         async with self.mutex:
-            await run_sync(self._do_reset)
+            self._do_reset()
 
     async def restart(self, auto_start: bool = True) -> None:
         """Terminate, reset, and execute the test again."""
@@ -377,7 +399,7 @@ class Test(TestBase):
     """Concrete test model with subprocess execution support."""
 
     exec: Script = Field(
-        default=...,
+        "",
         validation_alias=AliasChoices("exec", "command", "script"),
         description=(
             "A shell command or a path to an executable file to run on test "
@@ -480,7 +502,7 @@ class Test(TestBase):
     ) -> None:
         async with anyio.create_task_group() as tg:
             self._process = await anyio.open_process(
-                str(self.exec),
+                command=str(self.exec),
                 cwd=self.cwd,
                 env=self.env,
                 stdout=aio.subprocess.PIPE,
@@ -522,11 +544,11 @@ class Test(TestBase):
             elif self._retcode == 0:
                 self._status = TestStatus.Finished
                 self._result = TestResult.Passed
-            elif self._retcode is None or 0 < self._retcode < 0x80:
-                self._status = TestStatus.Terminated
+            elif self._retcode is not None and 0 < self._retcode < 0x80:
+                self._status = TestStatus.Finished
                 self._result = TestResult.Failed
             else:
-                self._status = TestStatus.Finished
+                self._status = TestStatus.Terminated
                 self._result = TestResult.Failed
 
             self._process = None

{socx_cli-0.13.7 → socx_cli-0.13.8}/socx_tui/regression/details.py

@@ -98,6 +98,7 @@ class RegressionStaticDetails(Static):
                     self.format_header(model),
                     f"💡 Status: {self.format_status(model.status)}",
                     f"🚩 Result: {self.format_result(model.result)}",
+                    f"🧑‍💻 Exit Code: {self.format_retcode(model.retcode)}"
                     f"⌛ Elapsed Time: {self.format_timedelta(model.elapsed_time)}",  # noqa: E501
                     f"⌛ Started Time: {self.format_time(model.started_time)}",
                     f"⌛ Finished Time: {self.format_time(model.finished_time)}",  # noqa: E501
@@ -126,6 +127,9 @@ class RegressionStaticDetails(Static):
             ["## 📜 Command/Script", "```bash", script_str, "```"]
         )
 
+    def format_retcode(self, retcode: int | None) -> str:
+        return str(retcode)
+
     def format_result(self, result: TestResult | str) -> str:
         if isinstance(result, TestResult):
             return result.value

{socx_cli-0.13.7 → socx_cli-0.13.8}/socx_tui/regression/dialog.py

@@ -161,24 +161,22 @@ class RestartSelectionDialog(ModalScreen[str | None]):
                 yield Button(
                     "Restart\nAll", id="restart-scope-all", variant="success"
                 )
-                yield Button(
-                    "Restart\nFailed or Stopped",
-                    id="restart-scope-failed-cancelled",
-                    variant="primary",
-                )
-                yield Button("Restart\nStopped", id="restart-scope-cancelled")
                 yield Button(
                     "Restart\nFailed",
                     id="restart-scope-failed",
                     variant="error",
                 )
+                yield Button(
+                    "Restart\nStopped",
+                    id="restart-scope-cancelled",
+                    variant="primary",
+                )
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         button_id = event.button.id
         mapping = {
             "restart-scope-all": "all",
-            "restart-scope-failed-cancelled": "failed_or_cancelled",
-            "restart-scope-cancelled": "cancelled",
             "restart-scope-failed": "failed",
+            "restart-scope-cancelled": "cancelled",
         }
         self.dismiss(mapping.get(button_id))

{socx_cli-0.13.7 → socx_cli-0.13.8}/socx_tui/regression/widget.py

@@ -9,7 +9,15 @@ from typing import Any, ClassVar
 
 import rich.repr
 from rich.text import Text
-from socx import Regression, Test, TestBase, TestResult, settings, enums
+from socx import (
+    Regression,
+    Test,
+    TestBase,
+    TestResult,
+    settings,
+    enums,
+    TestStatus,
+)
 from textual import on, work
 from textual.app import ComposeResult
 from textual.binding import Binding, BindingType
@@ -237,12 +245,10 @@ class RegressionWidget(Widget, can_focus=False, inherit_bindings=True):
             match scope:
                 case "all":
                     return True
-                case "cancelled":
-                    return t.terminated
                 case "failed":
-                    return t.failed and not t.terminated
-                case "failed_or_cancelled":
-                    return t.failed
+                    return t.result is TestResult.Failed
+                case "cancelled":
+                    return t.status is TestStatus.Terminated
                 case _:
                     return False
 
@@ -480,7 +486,12 @@ class RegressionWidget(Widget, can_focus=False, inherit_bindings=True):
     def _format_test_status_label(self, test: TestBase) -> Text:
         status = f"💡 {self.details_view.details.format_status(test.status)}"
         result = f"🚩 {self.details_view.details.format_result(test.result)}"
-        return Text.assemble("[", "|".join([status, result]), "]")
+
+        if isinstance(test, Test):
+            retcode = f"🧑‍💻 {self.details_view.details.format_retcode(test.retcode)}"  # noqa: E501
+            return Text.assemble("[", "|".join([status, result, retcode]), "]")
+        else:
+            return Text.assemble("[", "|".join([status, result]), "]")
 
     def _no_model_selected_notification(self) -> None:
         msg = "Select a regression or test first."