Float fix

truenas · Sep 17, 2024 · 0412117 · 0412117
1 parent 48f8597
commit 0412117
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/middlewared/middlewared/api/v25_04_0/smartctl.py b/src/middlewared/middlewared/api/v25_04_0/smartctl.py
@@ -9,7 +9,7 @@ class AtaSelfTest(BaseModel):
     description: str
     status: str
     status_verbose: str
-    remaining: int
+    remaining: float
     lifetime: int
     lba_of_first_error: int | None = None
 

diff --git a/src/middlewared/middlewared/plugins/smart.py b/src/middlewared/middlewared/plugins/smart.py
@@ -50,7 +50,7 @@ def parse_smart_selftest_results(data) -> list[AtaSelfTest] | list[NvmeSelfTest]
 
                 # remaining_percent is in the dict only if the test is in progress (status value & 0x0f)
                 if remaining := entry["status"]["value"] & 0x0f:
-                    remaining = entry["status"]["remaining_percent"]
+                    remaining = entry["status"]["remaining_percent"] / 100
 
                 test = AtaSelfTest(
                     num=index,

diff --git a/src/middlewared/middlewared/pytest/unit/plugins/test_smart.py b/src/middlewared/middlewared/pytest/unit/plugins/test_smart.py
@@ -51,7 +51,7 @@ def test__parse_smart_selftest_results__ataprint__1():
             description="Short offline",
             status="SUCCESS",
             status_verbose="Completed without error",
-            remaining=0,
+            remaining=0.0,
             lifetime=16590,
             lba_of_first_error=None
         ),
@@ -98,7 +98,7 @@ def test__parse_smart_selftest_results__ataprint__2():
             description="Offline",
             status="RUNNING",
             status_verbose="Self-test routine in progress",
-            remaining=100,
+            remaining=1.0,
             lifetime=0,
             lba_of_first_error=None
         )