Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions cardano_node_tests/tests/issues.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
repo="IntersectMBO/cardano-api",
message="Broken `nextEpochEligibleLeadershipSlots`.",
)
api_484 = blockers.GH(
issue=484,
repo="IntersectMBO/cardano-api",
fixed_in="10.7.0", # Unknown yet, will be fixed/changed sometime in the future
message="Repeated certificates stripped from Conway transaction.",
)
api_829 = blockers.GH(
issue=829,
repo="IntersectMBO/cardano-api",
Expand Down Expand Up @@ -191,6 +185,11 @@
fixed_in="8.12.0", # Unknown yet, will be fixed/changed sometime in the future
message="Inconsistent listing of DRep expiry.",
)
ledger_4566 = blockers.GH(
issue=4566,
repo="IntersectMBO/cardano-ledger",
message="Repeated certificates stripped from Conway transaction.",
)
ledger_4772 = blockers.GH(
issue=4772,
repo="IntersectMBO/cardano-ledger",
Expand Down
16 changes: 12 additions & 4 deletions cardano_node_tests/tests/test_addr_registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,12 @@ def test_addr_registration_certificate_order(
)
except (clusterlib.CLIError, submit_api.SubmitApiError) as exc:
str_exc = str(exc)
if "(ValueNotConservedUTxO" in str_exc and VERSIONS.transaction_era >= VERSIONS.CONWAY:
issues.api_484.finish_test()
if "(ValueNotConservedUTxO" in str_exc:
if VERSIONS.transaction_era == VERSIONS.CONWAY:
# The ledger issue 4566 will not be fixed in Conway
issues.ledger_4566.finish_test(force_blocked=True)
if VERSIONS.transaction_era > VERSIONS.CONWAY:
Comment thread
mkoura marked this conversation as resolved.
issues.ledger_4566.finish_test()
if build_method == clusterlib_utils.BuildMethods.BUILD_EST and (
"The transaction balance is negative" in str_exc
or "does not balance in its use of assets" in str_exc
Expand All @@ -322,8 +326,12 @@ def test_addr_registration_certificate_order(

# Check that the stake address is registered
stake_addr_info = cluster.g_query.get_stake_addr_info(user_registered.stake.address)
if not stake_addr_info and VERSIONS.transaction_era >= VERSIONS.CONWAY:
issues.api_484.finish_test()
if not stake_addr_info:
if VERSIONS.transaction_era == VERSIONS.CONWAY:
# The ledger issue 4566 will not be fixed in Conway
issues.ledger_4566.finish_test(force_blocked=True)
if VERSIONS.transaction_era > VERSIONS.CONWAY:
Comment thread
mkoura marked this conversation as resolved.
issues.ledger_4566.finish_test()
assert stake_addr_info, f"Stake address is not registered: {user_registered.stake.address}"

# Check that the balance for source address was correctly updated and that key deposit
Expand Down
4 changes: 2 additions & 2 deletions cardano_node_tests/utils/blockers.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ def _issue_is_blocked(self) -> bool:
"""Check if an issue is blocked."""
return self._issue_blocked_in_version(VERSIONS.node)

def finish_test(self) -> None:
def finish_test(self, force_blocked: bool = False) -> None:
"""Fail or Xfail test with GitHub issue reference."""
Comment thread
mkoura marked this conversation as resolved.
reason = f"{self.gh_issue}: {self.message}"
log_message = f"{self.gh_issue.url} => {self.message}"

if self.is_blocked():
if force_blocked or self.is_blocked():
LOGGER.warning(f"XFAIL: {log_message}")
pytest.xfail(reason)
else:
Expand Down
Loading