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

tests: add ETCS braking curve integration tests for stops only #10294

Merged
merged 4 commits into from
Jan 24, 2025
Merged

tests: add ETCS braking curve integration tests for stops only #10294

merged 4 commits into from
Jan 24, 2025

Conversation

bougue-pe
Copy link
Contributor

@bougue-pe bougue-pe commented Jan 9, 2025 •
edited
Loading

  • Added the final stop to get a final braking curve (more realistic) on small_infra test.
  • Mutualize small_infra and etcs_infra generation
  • Test stop braking curves (rough shape, target position)

🔍 review by commit is advised (especially the infra-generation part)

Fixes #10298
Fixes part of #10495

@bougue-pe bougue-pe requested a review from Erashin January 9, 2025 08:54
@bougue-pe bougue-pe requested review from a team as code owners January 9, 2025 08:54
@bougue-pe bougue-pe requested review from shenriotpro and removed request for a team January 9, 2025 08:54
@github-actions github-actions bot added area:core Work on Core Service area:integration-tests Work on Integration test, by nature related to different services labels Jan 9, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 9, 2025 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 94.87179% with 6 lines in your changes missing coverage. Please review.

Project coverage is 81.82%. Comparing base (a90a394) to head (a66cba2).
Report is 8 commits behind head on dev.

Files with missing lines Patch % Lines
tests/conftest.py 80.00% 5 Missing ⚠️
tests/fuzzer/fuzzer.py 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##              dev   #10294      +/-   ##
==========================================
+ Coverage   81.81%   81.82%   +0.01%     
==========================================
  Files        1073     1073              
  Lines      106718   106829     +111     
  Branches      730      730              
==========================================
+ Hits        87306    87413     +107     
- Misses      19373    19377       +4     
  Partials       39       39
Flag Coverage Δ
editoast 74.29% <ø> (ø)
front 89.34% <ø> (ø)
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.50% <ø> (ø)
tests 88.14% <94.87%> (+1.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bougue-pe bougue-pe mentioned this pull request Jan 9, 2025
Merged
Base automatically changed from peb/editoast/add_etcs_brake_params_to_rs_model to dev January 9, 2025 09:49
@github-actions github-actions bot requested review from a team as code owners January 9, 2025 09:49
shenriotpro
shenriotpro reviewed Jan 9, 2025
View reviewed changes
@bougue-pe bougue-pe force-pushed the peb/tests/add_etcs_integration_tests branch from 3e87ad4 to 53afcc1 Compare January 9, 2025 10:53
@bougue-pe bougue-pe requested review from a team and bloussou and removed request for a team and bloussou January 9, 2025 10:53
@bougue-pe bougue-pe mentioned this pull request Jan 15, 2025
Merged
@bougue-pe bougue-pe force-pushed the peb/tests/add_etcs_integration_tests branch from 53afcc1 to b591d07 Compare January 16, 2025 09:16
@github-actions github-actions bot added area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service and removed area:core Work on Core Service labels Jan 16, 2025
woshilapin
woshilapin approved these changes Jan 16, 2025
View reviewed changes
@bougue-pe bougue-pe changed the title tests: add (xfail) ETCS braking curve integration test tests: add ETCS braking curve integration tests for stops only Jan 16, 2025
@bougue-pe bougue-pe force-pushed the peb/tests/add_etcs_integration_tests branch 2 times, most recently from 7eb5f9d to 5454881 Compare January 17, 2025 09:10
@bougue-pe bougue-pe force-pushed the peb/tests/add_etcs_integration_tests branch from 5454881 to 396fcc4 Compare January 24, 2025 08:26
@github-actions github-actions bot removed area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service labels Jan 24, 2025
@bougue-pe bougue-pe requested review from shenriotpro and removed request for a team January 24, 2025 09:17
Erashin
Erashin approved these changes Jan 24, 2025
View reviewed changes
Copy link
Contributor

@Erashin Erashin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ticks all the EoA test cases. This will probably be affected by incoming SvL code changes, kinda depends on how the infra is built.
Thanks for that!

@bougue-pe
tests: add ETCS stop braking curve integration test
09a8772 
* Added the final stop to get a final braking curve on small-infra tests.

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>
@bougue-pe
tests: extract small_infra generation to a method
25b987e 
Nothing more in this commit

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>
@bougue-pe
tests: small improvements on small_infra generator
5cb985f 
Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>
@bougue-pe
tests: mutualize small_infra create function with etcs_infra
a66cba2 
- move create fn to dedicated module
- add signaling_system param

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>
@bougue-pe bougue-pe force-pushed the peb/tests/add_etcs_integration_tests branch from 22ab1ab to a66cba2 Compare January 24, 2025 13:01
@bougue-pe bougue-pe added this pull request to the merge queue Jan 24, 2025
Merged via the queue into dev with commit 86a9a8e Jan 24, 2025
27 checks passed
@bougue-pe bougue-pe deleted the peb/tests/add_etcs_integration_tests branch January 24, 2025 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woshilapin woshilapin woshilapin approved these changes

@leovalais leovalais leovalais approved these changes

@Erashin Erashin Erashin approved these changes

@shenriotpro shenriotpro shenriotpro approved these changes

Assignees
No one assigned
Labels
area:integration-tests Work on Integration test, by nature related to different services
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tests: try to merge small_infra BAL and ERTMS
6 participants
@bougue-pe @codecov-commenter @woshilapin @leovalais @Erashin @shenriotpro