Improve error handling in measurement register with discovery service

ni_measurementlink_service/_internal/discovery_client.py

@@ -132,15 +132,15 @@ def register_measurement_service(
                 )
             else:
                 _logger.exception("Error in registering with discovery service.")
-            return False
+            raise
         except FileNotFoundError:
             _logger.error(
                 "Unable to register with discovery service. Possible reason: discovery service not running."
             )
-            return False
+            raise
         except Exception:
             _logger.exception("Error in registering with discovery service.")
-            return False
+            raise
         return True
 
     def unregister_service(self) -> bool:
@@ -172,15 +172,15 @@ def unregister_service(self) -> bool:
                 )
             else:
                 _logger.exception("Error in unregistering with discovery service.")
-            return False
+            raise
         except FileNotFoundError:
             _logger.error(
                 "Unable to unregister with discovery service. Possible reason: discovery service not running."
             )
-            return False
+            raise
         except Exception:
             _logger.exception("Error in unregistering with discovery service.")
-            return False
+            raise
         return True
 
     def resolve_service(self, provided_interface: str, service_class: str = "") -> ServiceLocation:

tests/integration/test_service_manager.py

@@ -14,7 +14,11 @@
     measurement_service_pb2_grpc,
 )
 from tests.utilities import loopback_measurement
-from tests.utilities.fake_discovery_service import FakeDiscoveryServiceStub
+from tests.utilities.fake_discovery_service import (
+    FakeDiscoveryServiceError,
+    FakeDiscoveryServiceStub,
+    FakeDiscoveryServiceStubError,
+)
 
 
 def test___grpc_service___start_service___service_hosted(grpc_service: GrpcService):
@@ -43,6 +47,20 @@ def test___grpc_service_without_discovery_service___start_service___service_host
     _validate_if_service_running_by_making_rpc(port_number)
 
 
+@pytest.mark.parametrize("expect_discovery_service_error_stub", [True])
+def test___grpc_service___start_service_error_registering_measurement___raises_error(
+    grpc_service: GrpcService,
+):
+    with pytest.raises(FakeDiscoveryServiceError):
+        grpc_service.start(
+            loopback_measurement.measurement_service.measurement_info,
+            loopback_measurement.measurement_service.service_info,
+            loopback_measurement.measurement_service.configuration_parameter_list,
+            loopback_measurement.measurement_service.output_parameter_list,
+            loopback_measurement.measurement_service.measure_function,
+        )
+
+
 def test___grpc_service_started___stop_service___service_stopped(grpc_service: GrpcService):
     port_number = grpc_service.start(
         loopback_measurement.measurement_service.measurement_info,
@@ -71,9 +89,19 @@ def discovery_client(discovery_service_stub: FakeDiscoveryServiceStub) -> Discov
 
 
 @pytest.fixture
-def discovery_service_stub() -> FakeDiscoveryServiceStub:
-    """Create a FakeDiscoveryServiceStub."""
-    return FakeDiscoveryServiceStub()
+def discovery_service_stub(expect_discovery_service_error_stub: bool) -> FakeDiscoveryServiceStub:
+    """Create a valid/error stub based on expect_discovery_service_error_stub value."""
+    return (
+        FakeDiscoveryServiceStubError()
+        if expect_discovery_service_error_stub
+        else FakeDiscoveryServiceStub()
+    )
+
+
+@pytest.fixture
+def expect_discovery_service_error_stub() -> bool:
+    """Boolean to choose between FakeDiscoveryServiceStub and FakeDiscoveryServiceStubError."""
+    return False
 
 
 def _validate_if_service_running_by_making_rpc(port_number):

tests/unit/test_discovery_client.py

@@ -167,7 +167,7 @@ def test___start_discovery_service___key_file_exist_after_poll___service_start_s
     )
 
 
-def test___discovery_service_exe_unavailable___register_service___registration_failure(
+def test___discovery_service_exe_unavailable___register_service___raises_file_not_found_error(
     mocker: MockerFixture,
     temp_discovery_key_file_path: pathlib.Path,
     temp_registration_json_file_path: pathlib.Path,
@@ -181,13 +181,12 @@ def test___discovery_service_exe_unavailable___register_service___registration_f
         return_value=temp_registration_json_file_path,
     )
     mocker.patch("subprocess.Popen", side_effect=FileNotFoundError)
-
     discovery_client = DiscoveryClient()
-    registration_success_flag = discovery_client.register_measurement_service(
-        _TEST_SERVICE_PORT, _TEST_SERVICE_INFO, _TEST_MEASUREMENT_INFO
-    )
 
-    assert not registration_success_flag
+    with pytest.raises(FileNotFoundError):
+        discovery_client.register_measurement_service(
+            _TEST_SERVICE_PORT, _TEST_SERVICE_INFO, _TEST_MEASUREMENT_INFO
+        )
 
 
 @pytest.fixture(scope="module")

tests/unit/test_service.py

@@ -5,6 +5,7 @@
 from typing import List, Type
 
 import pytest
+from pytest_mock import MockerFixture
 
 from ni_measurementlink_service.measurement.info import DataType, TypeSpecialization
 from ni_measurementlink_service.measurement.service import MeasurementService
@@ -350,6 +351,20 @@ def test___measurement_service___add_configuration_with_invalid_enum_type___rais
         )
 
 
+def test___measurement_service___host_service_with_grpc_service_not_started___raises_error(
+    measurement_service: MeasurementService,
+    mocker: MockerFixture,
+):
+    measurement_service.register_measurement(_fake_measurement_function)
+    mocker.patch(
+        "ni_measurementlink_service._internal.service_manager.GrpcService.start",
+        side_effect=Exception,
+    )
+
+    with pytest.raises(Exception):
+        measurement_service.host_service()
+
+
 @pytest.fixture
 def measurement_service(test_assets_directory: pathlib.Path) -> MeasurementService:
     """Create a MeasurementService."""

tests/utilities/fake_discovery_service.py

@@ -29,8 +29,14 @@ class FakeDiscoveryServiceStubError(FakeDiscoveryServiceStub):
 
     def RegisterService(self, request):  # noqa: N802 - function name should be lowercase
         """Fake gRPC registration call to discovery service."""
-        raise Exception("TestException")
+        raise FakeDiscoveryServiceError("TestException")
 
     def UnregisterService(self, request):  # noqa: N802 - function name should be lowercase
         """Fake gRPC un-registration call to discovery service."""
-        raise Exception("TestException")
+        raise FakeDiscoveryServiceError("TestException")
+
+
+class FakeDiscoveryServiceError(Exception):
+    """Fake discovery service error to mimic the exceptions thrown from  discovery service."""
+
+    pass