[INDY-2140] Fix tests in view_change directory #1366
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
October 2, 2019 13:46
…/indy-2223-integrate Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
…tegrate Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
…/indy-2223-integrate Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
lampkin-diet
requested review from
ashcherbakov,
skhoroshavin and
Toktar
as code owners
skhoroshavin
previously approved these changes
Oct 7, 2019
| @@ -292,6 +292,7 @@ def _finish_view_change(self): | |||
| view_changes=self._new_view.viewChanges, | |||
| checkpoint=self._new_view.checkpoint, | |||
| batches=self._new_view.batches)) | |||
| self._data.last_completed_view_no = self._new_view.viewNo | |||
There was a problem hiding this comment.
Why reference self._new_view instead of self._data.view_no? Can they be different?
plenum/test/view_change/test_disconnected_node_reconnects_after_view_change.py
Outdated
Show resolved
Hide resolved
added 2 commits
October 7, 2019 18:20
…tegrate Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
skhoroshavin
approved these changes
Oct 8, 2019
| @@ -292,6 +292,7 @@ def _finish_view_change(self): | |||
| view_changes=self._new_view.viewChanges, | |||
| checkpoint=self._new_view.checkpoint, | |||
| batches=self._new_view.batches)) | |||
| self._data.last_completed_view_no = self._data.view_no | |||
There was a problem hiding this comment.
Actually I wasn't insisting on change, just asking :)
ashcherbakov
reviewed
Oct 9, 2019
| @@ -20,7 +20,7 @@ def tconf(tconf): | |||
| yield tconf | |||
|
|
|||
|
|
|||
| @pytest.mark.skip(reason="INDY-2223: Temporary skipped to create build") | |||
| @pytest.mark.skip(reason="All commits before vc will be cleared and we don't order during vc") | |||
There was a problem hiding this comment.
I think this test still makes sense ans should pass with the current code. Commits coming during view change will be discarded, but we will do re-ordering in new view, and all batches we have prepared certificates for will be ordered eventually
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.