From cade53755e97e2b7f4198c778e3e63dfb7c1f120 Mon Sep 17 00:00:00 2001 From: Jeff Bencin Date: Fri, 31 Jan 2025 10:37:40 -0500 Subject: [PATCH 1/2] fix: Disable flaky test `flash_blocks_on_epoch_3` --- .github/workflows/bitcoin-tests.yml | 3 ++- testnet/stacks-node/src/tests/nakamoto_integrations.rs | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bitcoin-tests.yml b/.github/workflows/bitcoin-tests.yml index 13d94438f9..57b37f44e7 100644 --- a/.github/workflows/bitcoin-tests.yml +++ b/.github/workflows/bitcoin-tests.yml @@ -83,7 +83,8 @@ jobs: - tests::neon_integrations::start_stop_bitcoind - tests::should_succeed_handling_malformed_and_valid_txs - tests::nakamoto_integrations::simple_neon_integration - - tests::nakamoto_integrations::flash_blocks_on_epoch_3 + # Disable this flaky test. We don't need continue testing Epoch 2 -> 3 transition + - tests::nakamoto_integrations::flash_blocks_on_epoch_3_FLAKY - tests::nakamoto_integrations::mine_multiple_per_tenure_integration - tests::nakamoto_integrations::block_proposal_api_endpoint - tests::nakamoto_integrations::miner_writes_proposed_block_to_stackerdb diff --git a/testnet/stacks-node/src/tests/nakamoto_integrations.rs b/testnet/stacks-node/src/tests/nakamoto_integrations.rs index 71775742d0..c9e8f6e161 100644 --- a/testnet/stacks-node/src/tests/nakamoto_integrations.rs +++ b/testnet/stacks-node/src/tests/nakamoto_integrations.rs @@ -1968,6 +1968,7 @@ fn restarting_miner() { #[test] #[ignore] +#[allow(non_snake_case)] /// This test spins up a nakamoto-neon node. /// It starts in Epoch 2.0, mines with `neon_node` to Epoch 3.0, /// having flash blocks when epoch updates and expects everything to work normally, @@ -1977,7 +1978,12 @@ fn restarting_miner() { /// * 30 blocks are mined after 3.0 starts. This is enough to mine across 2 reward cycles /// * A transaction submitted to the mempool in 3.0 will be mined in 3.0 /// * The final chain tip is a nakamoto block -fn flash_blocks_on_epoch_3() { +/// +/// NOTE: This test has been disabled because it's flaky, and we don't need to +/// test the Epoch 3 transition since it's already happened +/// +/// See issue [#5765](https://github.com/stacks-network/stacks-core/issues/5765) for details +fn flash_blocks_on_epoch_3_FLAKY() { if env::var("BITCOIND_TEST") != Ok("1".into()) { return; } From 6041be6784e0b3576370428a265dab9521d54be9 Mon Sep 17 00:00:00 2001 From: Jeff Bencin Date: Fri, 31 Jan 2025 16:04:03 -0500 Subject: [PATCH 2/2] fix: Disable flaky test `flash_blocks_on_epoch_3` for real this time --- .github/workflows/bitcoin-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bitcoin-tests.yml b/.github/workflows/bitcoin-tests.yml index 57b37f44e7..2f1ea4f219 100644 --- a/.github/workflows/bitcoin-tests.yml +++ b/.github/workflows/bitcoin-tests.yml @@ -84,7 +84,7 @@ jobs: - tests::should_succeed_handling_malformed_and_valid_txs - tests::nakamoto_integrations::simple_neon_integration # Disable this flaky test. We don't need continue testing Epoch 2 -> 3 transition - - tests::nakamoto_integrations::flash_blocks_on_epoch_3_FLAKY + # - tests::nakamoto_integrations::flash_blocks_on_epoch_3_FLAKY - tests::nakamoto_integrations::mine_multiple_per_tenure_integration - tests::nakamoto_integrations::block_proposal_api_endpoint - tests::nakamoto_integrations::miner_writes_proposed_block_to_stackerdb