From b515ae37932b800b69df3ded320e4b673ee23cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Tue, 25 Aug 2026 18:09:40 +0200 Subject: Retport summary of test execution Changelog: Added `--report` command-line option to print summary of passed/failed tests. --- test/script/definition.et | 2 +- test/script/expansion.et | 2 +- test/script/list.et | 2 +- test/script/network.et | 2 +- test/script/output.et | 4 ++-- test/script/run.et | 38 ++++++++++++++++++++------------------ test/script/shell.et | 20 ++++++++++---------- 7 files changed, 36 insertions(+), 34 deletions(-) (limited to 'test') diff --git a/test/script/definition.et b/test/script/definition.et index 5490349..31ae21f 100644 --- a/test/script/definition.et +++ b/test/script/definition.et @@ -18,4 +18,4 @@ test Definition: expect /run-test-result Test (.*)/ capture result guard (result == "done") expect /(.*)/ capture done - guard (done == "run-done") + guard (done == "run-done 1 1 0 0") diff --git a/test/script/expansion.et b/test/script/expansion.et index 86a81dc..85c241d 100644 --- a/test/script/expansion.et +++ b/test/script/expansion.et @@ -12,4 +12,4 @@ test VariableExpansion: for str in [ "1", "1.3", "abc", "abc" ]: expect /child-stdout p $str/ expect /match p $str/ - expect /run-done/ + expect /run-done 1 1 0 0/ diff --git a/test/script/list.et b/test/script/list.et index 4b493a5..7a032cb 100644 --- a/test/script/list.et +++ b/test/script/list.et @@ -39,4 +39,4 @@ test ListConcat: local: expect /run-test-result Test (.*)/ capture result guard (result == "done") - expect /run-done/ + expect /run-done 1 1 0 0/ diff --git a/test/script/network.et b/test/script/network.et index 62006ad..2978910 100644 --- a/test/script/network.et +++ b/test/script/network.et @@ -15,7 +15,7 @@ def run_test_from using p (file): send "run Test" expect /run-test-result Test (.*)/ capture result guard (result == "done") - expect /run-done/ + expect /run-done 1 1 0 0/ test DisconnectNode: diff --git a/test/script/output.et b/test/script/output.et index f210490..8fb5616 100644 --- a/test/script/output.et +++ b/test/script/output.et @@ -24,7 +24,7 @@ test FlushOutput: expect /run-test-result Test (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ test IgnoreOutput: spawn as p @@ -54,4 +54,4 @@ test IgnoreOutput: expect /run-test-result Test (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ diff --git a/test/script/run.et b/test/script/run.et index 87218c0..d58746a 100644 --- a/test/script/run.et +++ b/test/script/run.et @@ -20,14 +20,16 @@ test TrivialRun: local: expect /run-test-result AlwaysSucceeds (.*)/ capture result guard (result == "done") - expect /run-done/ + expect /run-done ([0-9]+) ([0-9]+) 0 0/ capture total, passed + guard (total == passed) send "run AlwaysFails" local: expect /match-fail .*/ expect /run-test-result AlwaysFails (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done ([0-9]+) 0 0 ([0-9]+)/ capture total, failed + guard (total == failed) test SimpleRun: @@ -47,7 +49,7 @@ test SimpleRun: local: expect /run-test-result Test (.*)/ capture result guard (result == "done") - expect /run-done/ + expect /run-done 1 1 0 0/ flush for file in should_fail: @@ -61,7 +63,7 @@ test SimpleRun: local: expect /run-test-result Test (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush @@ -88,7 +90,7 @@ test RunConfig: expect /child-stdout p abcdef/ expect /match p abcdef/ expect /run-test-result ExpectEcho done/ - expect /run-done/ + expect /run-done 3 2 0 1/ test GetSysInfo: @@ -107,7 +109,7 @@ test GetSysInfo: send "load-config" expect /load-config-done/ send "run SysInfo" - expect /run-done/ + expect /run-done 1 1 0 0/ test CallStack: @@ -126,7 +128,7 @@ test CallStack: local: expect /run-test-result AG (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run AE" @@ -139,7 +141,7 @@ test CallStack: local: expect /run-test-result AE (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run BG" @@ -153,7 +155,7 @@ test CallStack: local: expect /run-test-result BG (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run CG" @@ -169,7 +171,7 @@ test CallStack: local: expect /run-test-result CG (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run BE" @@ -184,7 +186,7 @@ test CallStack: local: expect /run-test-result BE (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run CE" @@ -201,7 +203,7 @@ test CallStack: local: expect /run-test-result CE (.*)/ capture result guard (result == "failed") - expect /run-done/ + expect /run-done 1 0 0 1/ flush @@ -223,7 +225,7 @@ test RunTag: guard (result == "done") local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 2 2 0 0") send "run B C" local: @@ -243,7 +245,7 @@ test RunTag: guard (result == "done") local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 5 5 0 0") test RunTagExclude: @@ -264,7 +266,7 @@ test RunTagExclude: guard (result == "done") local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 2 2 0 0") send "run T1 B1 A C ^B ^A1" local: @@ -281,7 +283,7 @@ test RunTagExclude: guard (result == "done") local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 4 4 0 0") test RunExcludeConfig1: @@ -304,7 +306,7 @@ test RunExcludeConfig1: expect /run-test-result C2 done/ local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 6 6 0 0") test RunExcludeConfig2: node n @@ -324,4 +326,4 @@ test RunExcludeConfig2: expect /run-test-result B2 done/ local: expect /run-(.*)/ capture done - guard (done == "done") + guard (done == "done 4 4 0 0") diff --git a/test/script/shell.et b/test/script/shell.et index 086d3d3..3384353 100644 --- a/test/script/shell.et +++ b/test/script/shell.et @@ -16,7 +16,7 @@ test ShellSpawn: expect /child-fail sh failed at: .*: false/ expect /child-fail sh exit code: 1/ expect /run-test-result ShellFalse failed/ - expect /run-done/ + expect /run-done 2 1 0 1/ def expect_next_stdout from p (expected): @@ -57,7 +57,7 @@ test ShellEcho: with p: expect /run-test-result Echo done/ - expect /run-done/ + expect /run-done 1 1 0 0/ test ShellPipe: @@ -97,7 +97,7 @@ test ShellPipe: expect /run-test-result PipeRedirect done/ with p: - expect /run-done/ + expect /run-done 3 3 0 0/ test ShellWorkingDirectory: @@ -136,23 +136,23 @@ test ShellExitOnError: send "run Default" expect /child-fail sh failed at: .*error-exit.et:4:9: false/ expect /run-test-result Default failed/ - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run DisabledSuccess" expect /run-test-result DisabledSuccess done/ - expect /run-done/ + expect /run-done 1 1 0 0/ flush send "run DisabledFailure" expect /run-test-result DisabledFailure failed/ - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run Enabled" expect /child-fail sh failed at: .*error-exit.et:25:9: false/ expect /run-test-result Enabled failed/ - expect /run-done/ + expect /run-done 1 0 0 1/ flush @@ -166,17 +166,17 @@ test ShellLogic: send "run NegateFalse" expect /run-test-result NegateFalse done/ - expect /run-done/ + expect /run-done 1 1 0 0/ flush send "run NegateTrue" expect /child-fail sh failed at: .*logic.et:9:9: ! true/ expect /run-test-result NegateTrue failed/ - expect /run-done/ + expect /run-done 1 0 0 1/ flush send "run NegateNothing" expect /child-fail sh failed at: .*logic.et:14:9: !/ expect /run-test-result NegateNothing failed/ - expect /run-done/ + expect /run-done 1 0 0 1/ flush -- cgit v1.2.3