Refactor some Dash-specific wait_for* functions in tests
#3122
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
PastaPastaPasta
requested changes
Sep 29, 2019
There was a problem hiding this comment.
scripted diff fails
~/workspace/dash$ ./contrib/devtools/commit-script-check.sh develop..HEAD
Running script for: d8b9c6bde97ff09c33126173459296a8c6e759c2
sed -i 's/wait_for_chainlock_tip_all_nodes\(/wait_for_chainlocked_tip_all_nodes\(/g' test/functional/*.py
sed -i 's/wait_for_chainlock_tip\(/wait_for_chainlocked_tip\(/g' test/functional/*.py
sed -i 's/wait_for_chainlock\(/wait_for_chainlocked_block\(/g' test/functional/*.py
sed -i 's/wait_for_chainlock /wait_for_chainlocked_block /g' test/functional/*.py
sed: -e expression #1, char 75: Unmatched ( or \(
sed: -e expression #1, char 55: Unmatched ( or \(
sed: -e expression #1, char 53: Unmatched ( or \(
Ran on Ubuntu 16.04
UdjinM6
force-pushed
the
refactorsomewait
branch
2 times, most recently
from
321f138 to
321fe82
Compare
UdjinM6
force-pushed
the
refactorsomewait
branch
2 times, most recently
from
0424795 to
321fe82
Compare
|
This should be fixed now. On a side note though, it looks like this thing https://github.com/dashpay/dash/blob/develop/ci/build_src.sh#L15 doesn't really work (and I'm not sure why). |
|
@UdjinM6 I assume the Maybe we should do this change in this PR so that we can also properly test it? |
|
Imo it should probably be a seperate PR that this gets rebased on, but I don't care that much. |
PastaPastaPasta
approved these changes
Sep 30, 2019
|
The issue with |
-BEGIN VERIFY SCRIPT- sed -i 's/wait_for_chainlock_tip_all_nodes(/wait_for_chainlocked_tip_all_nodes(/g' test/functional/*.py sed -i 's/wait_for_chainlock_tip(/wait_for_chainlocked_tip(/g' test/functional/*.py sed -i 's/wait_for_chainlock(/wait_for_chainlocked_block(/g' test/functional/*.py sed -i 's/wait_for_chainlock /wait_for_chainlocked_block /g' test/functional/*.py -END VERIFY SCRIPT-
…of custom timers
UdjinM6
dismissed stale reviews from PastaPastaPasta and codablock
via
ee8fd7c
UdjinM6
force-pushed
the
refactorsomewait
branch
from
321fe82 to
ee8fd7c
Compare
PastaPastaPasta
approved these changes
Oct 1, 2019
barrystyle
pushed a commit
to PACGlobalOfficial/PAC
that referenced
this pull request
Jan 22, 2020
) * scripted-diff: Rename `wait_for_chainlock*` test functions -BEGIN VERIFY SCRIPT- sed -i 's/wait_for_chainlock_tip_all_nodes(/wait_for_chainlocked_tip_all_nodes(/g' test/functional/*.py sed -i 's/wait_for_chainlock_tip(/wait_for_chainlocked_tip(/g' test/functional/*.py sed -i 's/wait_for_chainlock(/wait_for_chainlocked_block(/g' test/functional/*.py sed -i 's/wait_for_chainlock /wait_for_chainlocked_block /g' test/functional/*.py -END VERIFY SCRIPT- * Move `wait_for_*chainlock*` functions from individual tests to DashTestFramework * Use `wait_until` in most Dash-specific `wait_for*` functions instead of custom timers
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.
Refactoring only, should be no changes in behaviour. Ignoring
wait_for_instantlockhere because its behaviour must be changed.