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
22 changes: 12 additions & 10 deletions cardano_node_tests/tests/test_node_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,7 @@ def test_ignore_log_errors(
):
"""Ignore selected errors in log right after node upgrade.

Test setup to ignore expected errors in node logs after upgrading from pre-UTxO-HD
releases. UTxO-HD was added in node 10.4.1.

* Check if upgraded node version is < 10.5.0
* If upgrading from pre-UTxO-HD release (node < 10.5.0):

- Add log ignore rule for ChainDB warning about invalid snapshot
- Ignore "MetadataFileDoesNotExist" error in stdout logs

* This prevents false test failures from expected upgrade-related log messages
This prevents false test failures from expected upgrade-related log messages.
"""
common.get_test_id(cluster_singleton)

Expand All @@ -117,6 +108,17 @@ def test_ignore_log_errors(
regex="ChainDB:Warning:.* Invalid snapshot DiskSnapshot .*MetadataFileDoesNotExist",
ignore_file_id=worker_id,
)
# The error should be present only when upgrading pre LSM release.
# The LSM was added in 10.7.0, so when we are upgrading from 10.7.0+ release to
# 10.8.0+ release, the error should not be there.
# Here we are comparing the version of "upgraded" release, not the version we are upgrading
# from.
if VERSIONS.node < version.parse("10.8.0"):
logfiles.add_ignore_rule(
files_glob="*.stdout",
regex="tablesCodecVersion",
ignore_file_id=worker_id,
)

@allure.link(helpers.get_vcs_link())
@pytest.mark.skipif(UPGRADE_TESTS_STEP != 2, reason="runs only on step 2 of upgrade testing")
Expand Down
2 changes: 1 addition & 1 deletion runner/node_upgrade_pytest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ elif [ "$1" = "step2" ]; then
pytest cardano_node_tests/tests/test_node_upgrade.py -k test_update_cost_models || exit 6

# generate ledger peer snapshot using old node version
cardano-cli query ledger-peer-snapshot \
cardano-cli-step1 query ledger-peer-snapshot \
--testnet-magic "$NETWORK_MAGIC" \
--socket-path "$STATE_CLUSTER/pool3.socket" \
--output-json \
Expand Down
Loading