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

[3.1] Fix test failure due to trx hitting near end of block production time #441

Merged
merged 3 commits into from
Nov 3, 2022
Merged

[3.1] Fix test failure due to trx hitting near end of block production time #441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ee6ed
GH-419 Previous fix for test was incomplete in that the validateTrxSt…
heifner Nov 3, 2022
b92b997
GH-419 Update to address PR comments. Revert to explicit present.
heifner Nov 3, 2022
4dcb831
GH-419 Improve assertion message by including both expected states.
heifner Nov 3, 2022
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
7 changes: 4 additions & 3 deletions tests/trx_finality_status_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,21 @@ def isState(state, expectedState, allowedState=None, notAllowedState=None):
state = getState(retStatus)

assert (state == localState or state == inBlockState), \
f"ERROR: getTransactionStatus didn't return \"{localState}\" state.\n\nstatus: {json.dumps(retStatus, indent=1)}"
f"ERROR: getTransactionStatus didn't return \"{localState}\" or \"{inBlockState}\" state.\n\nstatus: {json.dumps(retStatus, indent=1)}"
status.append(copy.copy(retStatus))
startingBlockNum=testNode.getInfo()["head_block_num"]

def validateTrxState(status, present):
bnPresent = "block_number" in status
biPresent = "block_id" in status
btPresent = "block_timestamp" in status
desc = "" if present else "not "
desc = "" if present else " not"
group = bnPresent and biPresent and btPresent if present else not bnPresent and not biPresent and not btPresent
assert group, \
f"ERROR: getTransactionStatus should{desc} contain \"block_number\", \"block_id\", or \"block_timestamp\" since state was \"{getState(status)}\".\nstatus: {json.dumps(status, indent=1)}"

validateTrxState(status[0], present=False)
present = True if state == inBlockState else False
validateTrxState(status[0], present)

def validate(status, knownTrx=True):
assert "head_number" in status and "head_id" in status and "head_timestamp" in status, \
Expand Down