Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Internal] [Work in Progress] Fix tests that causes LabVIEW hang #514

Closed
wants to merge 13 commits into from
Closed

[Internal] [Work in Progress] Fix tests that causes LabVIEW hang #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5c30b2
Fix: Add delay of 5s in tests
MounikaBattu17 May 15, 2024
5bf3947
Fix: Start Discovery Service manually
MounikaBattu17 May 15, 2024
c0b30a1
Fix: Removed fixed issue tests from skip list
MounikaBattu17 May 15, 2024
68ae127
Fix: revrt back test changes
MounikaBattu17 May 15, 2024
f4a9206
Fix: Added delay in Kill Service
MounikaBattu17 May 15, 2024
1915e0d
Test: Decrease delay time to 3s
MounikaBattu17 May 16, 2024
3f29acb
Test commit
MounikaBattu17 May 16, 2024
253eb05
Test: Check for key file
MounikaBattu17 May 16, 2024
c9f1982
Test: Syntax change
MounikaBattu17 May 16, 2024
685b9df
Test: Add more logs
MounikaBattu17 May 16, 2024
e46d854
Test: Add wait time
MounikaBattu17 May 16, 2024
8bacea8
Test: Add cluster id for starting Discovery service
MounikaBattu17 May 17, 2024
697c700
Test: Remove logger
MounikaBattu17 May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/run_g_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ jobs:
Start-Process "C:\\Program Files\\National Instruments\\LabVIEW ${{ matrix.version }}\\LabVIEW.exe"
Start-Sleep 60

- name: Run Discovery Service
run: |
Start-Process -FilePath "C:\\Program Files\\National Instruments\\Shared\\MeasurementLink\\Discovery\\NationalInstruments.MeasurementLink.DiscoveryService.exe" -WorkingDirectory "C:\\Program Files\\National Instruments\\Shared\\MeasurementLink\\Discovery"
Start-Sleep 10

- name: Run G Tests
run:
python ${{runner.workspace}}/measurementlink-labview/Source/Tests/run_tests.py --labview-path "C:\Program Files\National Instruments\LabVIEW ${{ matrix.version }}\LabVIEW.exe" --port-number ${{ matrix.port }}
Expand Down
4 changes: 0 additions & 4 deletions Source/Runtime/Measurement Server.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@
<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
<Item Name="GetHelpDir.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetHelpDir.vi"/>
<Item Name="VISA gRPC Options.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Options.ctl"/>
<Item Name="VISA Format gRPC Resource Name.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC Resource Name.vi"/>
<Item Name="VISA Format gRPC URI.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC URI.vi"/>
<Item Name="ni.protobuf.types.lvlib" Type="Library" URL="/&lt;vilib&gt;/gRPC/Generated APIs/ni/protobuf/types/ni.protobuf.types.lvlib"/>
</Item>
<Item Name="instr.lib" Type="Folder">
<Item Name="niDCPower Initialize With Independent Channels for gRPC session.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Initialize With Independent Channels for gRPC session.vi"/>
Expand Down
Binary file modified ...scovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
View file
Open in desktop
MounikaBattu17 marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi
View file
Open in desktop
MounikaBattu17 marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added Source/Tests/Tests.Runtime/Measurement Server/Helpers/Start Discovery Service.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Tests/Tests.Runtime/Measurement Server/Helpers/Wait For Key File.vi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
<Item Name="Restart Discovery Service.vi" Type="VI" URL="../Helpers/Restart Discovery Service.vi"/>
<Item Name="Fake Session Factory.lvclass" Type="LVClass" URL="../Helpers/Fake Session Factory/Fake Session Factory.lvclass"/>
<Item Name="Kill Pin Map Service.vi" Type="VI" URL="../Helpers/Kill Pin Map Service.vi"/>
<Item Name="Wait For Key File.vi" Type="VI" URL="../Helpers/Wait For Key File.vi"/>
<Item Name="Start Discovery Service.vi" Type="VI" URL="../Helpers/Start Discovery Service.vi"/>
</Item>
<Item Name="Close Sessions" Type="Folder">
<Item Name="Test Inputs" Type="Folder">
Expand Down
8 changes: 1 addition & 7 deletions Source/Tests/skip_tests.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading