Skip to content

Commit c7f1e6d

Browse files
committed
Disable extra tests when elasticsearch enabled
1 parent 7306511 commit c7f1e6d

File tree

2 files changed

+57
-4
lines changed

2 files changed

+57
-4
lines changed

nix/packages/zebra/default.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ craneLib.buildPackage (
4747
## be removed.
4848
ZEBRA_SKIP_NETWORK_TESTS = true;
4949

50-
cargoTestExtraArgs =
51-
lib.escapeShellArgs
52-
(["--"]
53-
++ lib.concatMap (test: ["--skip" test]) (import ./failing-tests.nix {inherit lib stdenv;}));
50+
cargoTestExtraArgs = let
51+
failingTests = import ./failing-tests.nix {inherit extraFeatures lib stdenv;};
52+
in
53+
lib.escapeShellArgs (["--"] ++ lib.concatMap (test: ["--skip" test]) failingTests);
5454

5555
meta.mainProgram = "zebrad";
5656
}

nix/packages/zebra/failing-tests.nix

+53
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
### Tests that fail on Nix, but aren’t skipped by `ZEBRA_SKIP_NETWORK_TESTS`.
22
{
3+
extraFeatures,
34
lib,
45
stdenv,
56
}:
@@ -63,3 +64,55 @@
6364
## zebrad – acceptance
6465
"non_blocking_logger"
6566
]
67+
## These tests seem to only fail when the `elasticsearch` feature is enabled on MacOS.
68+
++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.elem "elasticsearch" extraFeatures) [
69+
## zebra-rpc
70+
"methods::tests::snapshot::test_rpc_response_data"
71+
"methods::tests::snapshot::test_z_get_treestate"
72+
"methods::tests::vectors::rpc_getaddresstxids_invalid_arguments"
73+
"methods::tests::vectors::rpc_getaddresstxids_response"
74+
"methods::tests::vectors::rpc_getaddressutxos_response"
75+
"methods::tests::vectors::rpc_getbestblockhash"
76+
"methods::tests::vectors::rpc_getblock"
77+
"methods::tests::vectors::rpc_getblockcount"
78+
"methods::tests::vectors::rpc_getblockcount_empty_state"
79+
"methods::tests::vectors::rpc_getblockhash"
80+
"methods::tests::vectors::rpc_getmininginfo"
81+
"methods::tests::vectors::rpc_getnetworksolps"
82+
"methods::tests::vectors::rpc_getpeerinfo"
83+
"methods::tests::vectors::rpc_getrawtransaction"
84+
"methods::tests::vectors::rpc_submitblock_errors"
85+
## zebra-scan
86+
"service::tests::scan_service_registers_keys_correctly"
87+
"tests::vectors::scanning_zecpages_from_populated_zebra_state"
88+
## zebra-state
89+
"service::read::tests::vectors::empty_read_state_still_responds_to_requests"
90+
"service::read::tests::vectors::populated_read_state_responds_correctly"
91+
"service::tests::chain_tip_sender_is_updated"
92+
"service::tests::empty_state_still_responds_to_requests"
93+
"service::tests::state_behaves_when_blocks_are_committed_in_order"
94+
"service::tests::state_behaves_when_blocks_are_committed_out_of_order"
95+
"service::tests::value_pool_is_updated"
96+
## zebra-state – basic
97+
"check_transcripts_mainnet"
98+
"check_transcripts_testnet"
99+
## zebrad
100+
"components::inbound::tests::fake_peer_set::caches_getaddr_response"
101+
"components::inbound::tests::fake_peer_set::inbound_block_height_lookahead_limit"
102+
"components::inbound::tests::fake_peer_set::mempool_advertise_transaction_ids"
103+
"components::inbound::tests::fake_peer_set::mempool_push_transaction"
104+
"components::inbound::tests::fake_peer_set::mempool_requests_for_transactions"
105+
"components::inbound::tests::fake_peer_set::mempool_transaction_expiration"
106+
"components::mempool::tests::vector::mempool_cancel_downloads_after_network_upgrade"
107+
"components::mempool::tests::vector::mempool_cancel_mined"
108+
"components::mempool::tests::vector::mempool_failed_download_is_not_rejected"
109+
"components::mempool::tests::vector::mempool_failed_verification_is_rejected"
110+
"components::mempool::tests::vector::mempool_queue"
111+
"components::mempool::tests::vector::mempool_reverifies_after_tip_change"
112+
"components::mempool::tests::vector::mempool_service_basic"
113+
"components::mempool::tests::vector::mempool_service_disabled"
114+
## zebrad – acceptance
115+
"db_init_outside_future_executor"
116+
"nu6_funding_streams_and_coinbase_balance"
117+
"validate_regtest_genesis_block"
118+
]

0 commit comments

Comments
 (0)