Skip to content

Commit

Permalink
test/e2e: wait for a first block before client cmds
Browse files Browse the repository at this point in the history
  • Loading branch information
@tzemanovic
tzemanovic committed Mar 6, 2023
1 parent f053725 commit 979a5ec
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 16 deletions.
5 changes: 5 additions & 0 deletions tests/src/e2e/ibc_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ fn run_ledger_ibc() -> Result<()> {
ledger_b.exp_string("Namada ledger node started")?;
ledger_a.exp_string("This node is a validator")?;
ledger_b.exp_string("This node is a validator")?;

// Wait for a first block
ledger_a.exp_string("Committed block hash")?;
ledger_b.exp_string("Committed block hash")?;

let _bg_ledger_a = ledger_a.background();
let _bg_ledger_b = ledger_b.background();

Expand Down
44 changes: 28 additions & 16 deletions tests/src/e2e/ledger_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@ fn ledger_txs_and_queries() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let vp_user = wasm_abs_path(VP_USER_WASM);
Expand Down Expand Up @@ -528,7 +529,8 @@ fn masp_txs_and_queries() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;

let _bg_ledger = ledger.background();

Expand Down Expand Up @@ -794,7 +796,8 @@ fn masp_pinned_txs() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;

let _bg_ledger = ledger.background();

Expand Down Expand Up @@ -957,7 +960,8 @@ fn masp_incentives() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;

let _bg_ledger = ledger.background();

Expand Down Expand Up @@ -1655,9 +1659,9 @@ fn invalid_transactions() -> Result<()> {
// 1. Run the ledger node
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
ledger.exp_string("Namada ledger node started")?;
// Wait to commit a block
ledger.exp_regex(r"Committed block hash.*, height: [0-9]+")?;

// Wait for a first block
ledger.exp_string("Committed block hash")?;

let bg_ledger = ledger.background();

Expand Down Expand Up @@ -1812,7 +1816,8 @@ fn pos_bonds() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
Expand Down Expand Up @@ -2016,7 +2021,8 @@ fn pos_init_validator() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
Expand Down Expand Up @@ -2182,10 +2188,8 @@ fn ledger_many_txs_in_a_block() -> Result<()> {
let mut ledger =
run_as!(*test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;

// Wait to commit a block
ledger.exp_regex(r"Committed block hash.*, height: [0-9]+")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let bg_ledger = ledger.background();

let validator_one_rpc = Arc::new(get_actor_rpc(&test, &Who::Validator(0)));
Expand Down Expand Up @@ -2298,7 +2302,8 @@ fn proposal_submission() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
Expand Down Expand Up @@ -2649,7 +2654,8 @@ fn proposal_offline() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(20))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
Expand Down Expand Up @@ -3097,6 +3103,11 @@ fn test_genesis_validators() -> Result<()> {
non_validator.exp_string("Namada ledger node started")?;
non_validator.exp_string("This node is not a validator")?;

// Wait for a first block
validator_0.exp_string("Committed block hash")?;
validator_1.exp_string("Committed block hash")?;
non_validator.exp_string("Committed block hash")?;

let bg_validator_0 = validator_0.background();
let bg_validator_1 = validator_1.background();
let _bg_non_validator = non_validator.background();
Expand Down Expand Up @@ -3327,7 +3338,8 @@ fn implicit_account_reveal_pk() -> Result<()> {
let mut ledger =
run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;

ledger.exp_string("Namada ledger node started")?;
// Wait for a first block
ledger.exp_string("Committed block hash")?;
let _bg_ledger = ledger.background();

let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
Expand Down

0 comments on commit 979a5ec

Please sign in to comment.