Fix tests causing Labview hang - Add Cluster Id support for tests (#522)

* Fix: Add cluster Id support * Fix: Revert back project change * Fix: Get absolute path for key file * Fix: Connect cluster id as input to create client * Fix: Review comments * Fix: Review comments * Fix: Add comments * Fix: revert back unwanted change * Fix: Update project files * Fix: Revert back this file addition * Fix: Revert back test movement change * Fix: Review comments
ni · May 30, 2024 · 0e09c1e · 0e09c1e
1 parent 5b2926b
commit 0e09c1e
Show file tree

Hide file tree

Showing 32 changed files with 3 additions and 9 deletions.
diff --git a/Source/Runtime/MeasurementLink Discovery V1/Create Client.vi b/Source/Runtime/MeasurementLink Discovery V1/Create Client.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/Discovery Client FGV.vi b/Source/Runtime/MeasurementLink Discovery V1/Discovery Client FGV.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/Ensure Discovery Service Started.vi b/Source/Runtime/MeasurementLink Discovery V1/Ensure Discovery Service Started.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/Get Discovery Service Address.vi b/Source/Runtime/MeasurementLink Discovery V1/Get Discovery Service Address.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/MeasurementLink Discovery V1.lvlib b/Source/Runtime/MeasurementLink Discovery V1/MeasurementLink Discovery V1.lvlib
@@ -33,13 +33,13 @@
 		</Item>
 		<Item Name="Get Discovery Service Address.vi" Type="VI" URL="../Get Discovery Service Address.vi"/>
 		<Item Name="Get Discovery Service Key File Path.vi" Type="VI" URL="../Get Discovery Service Key File Path.vi">
-			<Property Name="NI.LibItem.Scope" Type="Int">4</Property>
+			<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
 		</Item>
 		<Item Name="Read Discovery Service Key File.vi" Type="VI" URL="../Read Discovery Service Key File.vi">
 			<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
 		</Item>
 		<Item Name="Start Discovery Service.vi" Type="VI" URL="../Start Discovery Service.vi">
-			<Property Name="NI.LibItem.Scope" Type="Int">4</Property>
+			<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
 		</Item>
 		<Item Name="Wait For Key File.vi" Type="VI" URL="../Wait For Key File.vi">
 			<Property Name="NI.LibItem.Scope" Type="Int">2</Property>

diff --git a/Source/Runtime/MeasurementLink Discovery V1/Recreate Client.vi b/Source/Runtime/MeasurementLink Discovery V1/Recreate Client.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/Start Discovery Service.vi b/Source/Runtime/MeasurementLink Discovery V1/Start Discovery Service.vi
diff --git a/Source/Runtime/MeasurementLink Discovery V1/TypeDefs/gRPC Client Cache FGV Action.ctl b/Source/Runtime/MeasurementLink Discovery V1/TypeDefs/gRPC Client Cache FGV Action.ctl
diff --git a/Source/Runtime/MeasurementLink Discovery V1/TypeDefs/gRPC Client Cache VI References.ctl b/Source/Runtime/MeasurementLink Discovery V1/TypeDefs/gRPC Client Cache VI References.ctl
diff --git a/Source/Runtime/MeasurementLink Discovery V1/gRPC Client Cache FGV Impl.vi b/Source/Runtime/MeasurementLink Discovery V1/gRPC Client Cache FGV Impl.vi
diff --git a/Source/Runtime/MeasurementLink Session Management V1/Session Reservation/Create Client.vi b/Source/Runtime/MeasurementLink Session Management V1/Session Reservation/Create Client.vi
diff --git a/Source/Runtime/MeasurementLink Session Management V1/Session Reservation/Recreate Client.vi b/Source/Runtime/MeasurementLink Session Management V1/Session Reservation/Recreate Client.vi
diff --git a/...e/Runtime/MeasurementLink Session Management V1/Session Reservation/Session Client FGV.vi b/...e/Runtime/MeasurementLink Session Management V1/Session Reservation/Session Client FGV.vi
diff --git a/...gistered_InvalidRegisterRequests_Error.vi → ...gistered_InvalidRegisterRequests_Error.vi b/...gistered_InvalidRegisterRequests_Error.vi → ...gistered_InvalidRegisterRequests_Error.vi
diff --git a/..._DiscoveryApiRoundTrip_AllNodesSucceed.vi → ..._DiscoveryApiRoundTrip_AllNodesSucceed.vi b/..._DiscoveryApiRoundTrip_AllNodesSucceed.vi → ..._DiscoveryApiRoundTrip_AllNodesSucceed.vi
diff --git a/...egistered_InvalidResolveRequests_Error.vi → ...egistered_InvalidResolveRequests_Error.vi b/...egistered_InvalidResolveRequests_Error.vi → ...egistered_InvalidResolveRequests_Error.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Client Cache FGV.vi b/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Client Cache FGV.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Create Client.vi b/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Create Client.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Recreate Client.vi b/Source/Tests/Tests.Runtime/Measurement Server/Discovery/Fake Recreate Client.vi
diff --git a/...scovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi b/...scovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Create Client.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Create Client.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Discovery Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Discovery Service.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Pin Map Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Pin Map Service.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Session Management Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Session Management Service.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Pin Map Client FGV.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Pin Map Client FGV.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Recreate Client.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Recreate Client.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi
diff --git a/...inmapWith3Pins_QueryPins_3PinsReported.vi → ...inmapWith3Pins_QueryPins_3PinsReported.vi b/...inmapWith3Pins_QueryPins_3PinsReported.vi → ...inmapWith3Pins_QueryPins_3PinsReported.vi
diff --git a/...ReserveSessionTwice_SecondReserveFails.vi → ...ReserveSessionTwice_SecondReserveFails.vi b/...ReserveSessionTwice_SecondReserveFails.vi → ...ReserveSessionTwice_SecondReserveFails.vi
diff --git a/...ManagementApiRoundTrip_AllNodesSucceed.vi → ...ManagementApiRoundTrip_AllNodesSucceed.vi b/...ManagementApiRoundTrip_AllNodesSucceed.vi → ...ManagementApiRoundTrip_AllNodesSucceed.vi
diff --git a/Source/Tests/run_tests.vi b/Source/Tests/run_tests.vi
diff --git a/Source/Tests/skip_tests.lst b/Source/Tests/skip_tests.lst
@@ -1,7 +1 @@
-test_DefaultTemplateMeasurement_GetUiDetails_CorrectUiPathUrl.vi
-test_NoServicesRegistered_InvalidRegisterRequests_Error.vi
-test_SingleServiceRegistered_DiscoveryApiRoundTrip_AllNodesSucceed.vi
-test_SingleServiceRegistered_InvalidResolveRequests_Error.vi
-test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
-test_DiscoveryWrapper_StopDiscoveryService_WrapperMethodsWorkWithoutError.vi
-test_SessionManagerWrapper_StopSessionManagementService_WrapperMethodsWorkWithoutError.vi
+test_DefaultTemplateMeasurement_GetUiDetails_CorrectUiPathUrl.vi