Comments addressed

lisa/base_tools/service.py

@@ -219,6 +219,7 @@ class WindowsServiceStatus(int, Enum):
     START_PENDING = 2
     STOP_PENDING = 3
     STOPPED = 1
+    NOT_FOUND = 0
 
 
 class WindowsService(Tool):
@@ -258,29 +259,30 @@ def wait_for_service_stop(self, name: str) -> None:
     def _check_exists(self) -> bool:
         return True
 
-    def _check_service_exists(self, name: str) -> bool:
-        try:
-            self._get_status(name)
-            return True
-        except LisaException:
+    def check_service_exists(self, name: str) -> bool:
+        if (
+            self._get_status(name, fail_on_error=False)
+            == WindowsServiceStatus.NOT_FOUND
+        ):
             return False
+        return True
 
-    def _check_service_running(self, name: str) -> bool:
-        return self._get_status(name) == WindowsServiceStatus.RUNNING
-
-    def _get_status(self, name: str = "") -> WindowsServiceStatus:
-        service_status = self.node.tools[PowerShell].run_cmdlet(
-            f"Get-Service {name}",
-            force_run=True,
-            output_json=True,
-            fail_on_error=False,
-        )
-        if not service_status:
-            raise LisaException(f"service '{name}' does not exist")
-        return WindowsServiceStatus(int(service_status["Status"]))
-
-    def _is_service_inactive(self, name: str) -> bool:
-        return self._get_status(name) == WindowsServiceStatus.STOPPED
+    def _get_status(
+        self, name: str = "", fail_on_error: bool = True
+    ) -> WindowsServiceStatus:
+        try:
+            service_status = self.node.tools[PowerShell].run_cmdlet(
+                f"Get-Service {name}",
+                force_run=True,
+                output_json=True,
+            )
+            return WindowsServiceStatus(int(service_status["Status"]))
+        except LisaException as identifier:
+            if "Cannot find any service with service name" in str(identifier):
+                if fail_on_error:
+                    raise LisaException(f"service '{name}' does not exist")
+                return WindowsServiceStatus.NOT_FOUND
+            raise identifier
 
     def _wait_for_service(self, name: str, status: WindowsServiceStatus) -> None:
         timeout = 60
@@ -294,5 +296,6 @@ def _wait_for_service(self, name: str, status: WindowsServiceStatus) -> None:
 
         if timeout < timer.elapsed():
             raise LisaException(
-                f"service '{name}' still in '{current_service_status}' state after '{timeout}' seconds"  # noqa: E501
+                f"service '{name}' still in '{current_service_status}' state"
+                f"after '{timeout}' seconds"
             )