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.

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

services: fix race in TestNotary #3390

Merged
merged 1 commit into from
Apr 2, 2024
Merged

services: fix race in TestNotary #3390

merged 1 commit into from
Apr 2, 2024

Conversation

AnnaShaleva
Copy link
Member

@AnnaShaleva AnnaShaleva commented Apr 1, 2024

Close #3366. Roll back the test structure to the one that it has before d2a7162. Add one extra block to ensure that main transaction won't be finilized. Add NVB increment slippage to avoid race between the first fallback acceptance and block acceptance.

Copy link

codecov bot commented Apr 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.80%. Comparing base (3090165) to head (f95004a).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3390      +/-   ##
==========================================
- Coverage   84.82%   84.80%   -0.03%     
==========================================
  Files         331      331              
  Lines       44969    44969              
==========================================
- Hits        38144    38134      -10     
- Misses       5315     5324       +9     
- Partials     1510     1511       +1     

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

pkg/services/notary/core_test.go Outdated Show resolved Hide resolved
pkg/services/notary/core_test.go Outdated Show resolved Hide resolved
pkg/services/notary/core_test.go Outdated Show resolved Hide resolved
Close #3366. Roll back the test structure to the one that it has before
d2a7162. Add one extra block to ensure
that main transaction won't be finilized. Add NVB increment slippage to
avoid race between the first fallback acceptance and block acceptance.
Add NVB increment slippage to the rest of fallbacks for test structure
unification.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
@roman-khimov roman-khimov merged commit 7202518 into master Apr 2, 2024
19 of 20 checks passed
@roman-khimov roman-khimov deleted the fix-notary-test branch April 2, 2024 12:26
AnnaShaleva added a commit that referenced this pull request Apr 3, 2024
1. Allow 1-block slippage for multisignature request block generation to
   ensure that PostPersist for fb's NVB-th block is properly finished.
2. Allow 1-block slippage before sent request checks to ensure that
   PostPersist for NVB fb's NVB-th block was finished and all
   stale mains were properly marked by Notary service.

Overall, this commits ports the approach of #3390 to the whole test.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
AnnaShaleva added a commit that referenced this pull request Apr 3, 2024
1. Allow 1-block slippage for multisignature request block generation to
   ensure that PostPersist for fb's NVB-th block is properly finished.
2. Allow 1-block slippage before sent request checks to ensure that
   PostPersist for NVB fb's NVB-th block was finished and all
   stale mains were properly marked by Notary service.

Overall, this commits ports the approach of #3390 to the whole test.

Close #3366.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestNotary ubuntu fails
2 participants