From 24daad874faf754e18f8bb42c55fbd19a55de210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Tue, 26 Jul 2022 14:21:36 +0200 Subject: [PATCH 1/2] test/e2e: update assert_success/failure to first consume output --- tests/src/e2e/ledger_tests.rs | 4 ++-- tests/src/e2e/setup.rs | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index f150e6eac0a..a83d3f54ca5 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -1566,7 +1566,7 @@ fn test_genesis_validators() -> Result<()> { let validator_0_alias = "validator-0"; let validator_1_alias = "validator-1"; - let init_genesis_validator_0 = setup::run_cmd( + let mut init_genesis_validator_0 = setup::run_cmd( Bin::Client, [ "utils", @@ -1602,7 +1602,7 @@ fn test_genesis_validators() -> Result<()> { .remove(validator_0_alias) .unwrap(); - let init_genesis_validator_1 = setup::run_cmd( + let mut init_genesis_validator_1 = setup::run_cmd( Bin::Client, [ "utils", diff --git a/tests/src/e2e/setup.rs b/tests/src/e2e/setup.rs index 2b0aba06966..28f1cf18257 100644 --- a/tests/src/e2e/setup.rs +++ b/tests/src/e2e/setup.rs @@ -503,14 +503,20 @@ impl AnomaCmd { } /// Assert that the process exited with success - pub fn assert_success(&self) { + pub fn assert_success(&mut self) { + // Make sure that there is no unread output first + let _ = self.exp_eof().unwrap(); + let status = self.session.wait().unwrap(); assert_eq!(WaitStatus::Exited(self.session.pid(), 0), status); } /// Assert that the process exited with failure #[allow(dead_code)] - pub fn assert_failure(&self) { + pub fn assert_failure(&mut self) { + // Make sure that there is no unread output first + let _ = self.exp_eof().unwrap(); + let status = self.session.wait().unwrap(); assert_ne!(WaitStatus::Exited(self.session.pid(), 0), status); } From 110c501f966ddb8de2dbbc869036300b51efd25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Mon, 1 Aug 2022 17:19:14 +0200 Subject: [PATCH 2/2] changelog: add #247 --- .changelog/unreleased/testing/247-e2e-fix-cmd-assert.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/testing/247-e2e-fix-cmd-assert.md diff --git a/.changelog/unreleased/testing/247-e2e-fix-cmd-assert.md b/.changelog/unreleased/testing/247-e2e-fix-cmd-assert.md new file mode 100644 index 00000000000..6696c5946af --- /dev/null +++ b/.changelog/unreleased/testing/247-e2e-fix-cmd-assert.md @@ -0,0 +1,2 @@ +- E2E: Consume unread output before checking exit status. + ([#247](https://github.com/anoma/namada/pull/247))