From a3c27356bfe3e56809f579b617e02829a7ea0a68 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Fri, 6 Feb 2026 03:50:24 +0700 Subject: all: use space log prefix instead of dummy date Using dummy date make the test output hard to read in verbose option, because the program logs mixed with the test logs. --- testdata/http_server/execute/cancel_test.data | 6 +++--- testdata/http_server/execute/local_test.data | 6 +++--- testdata/local/cancel_test.data | 4 ++-- testdata/local/local_encrypted.data | 16 ++++++++-------- testdata/local/local_test.data | 14 +++++++------- testdata/play/awwanssh.test/play_test.data | 12 ++++++------ 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'testdata') diff --git a/testdata/http_server/execute/cancel_test.data b/testdata/http_server/execute/cancel_test.data index 4611da6..edf21f9 100644 --- a/testdata/http_server/execute/cancel_test.data +++ b/testdata/http_server/execute/cancel_test.data @@ -30,15 +30,15 @@ event: begin data: "2023-11-26T15:21:00Z" event: message -data: "----/--/-- --:--:-- === BEGIN: local /cancel.aww 1-\n" +data: " === BEGIN: local /cancel.aww 1-\n" id: 0 event: message -data: "----/--/-- --:--:-- --> 1: sleep 300\n" +data: " --> 1: sleep 300\n" id: 1 event: message -data: "----/--/-- --:--:-- !!! ExecLocal: signal: killed\n" +data: " !!! ExecLocal: signal: killed\n" id: 2 event: message diff --git a/testdata/http_server/execute/local_test.data b/testdata/http_server/execute/local_test.data index d58e0cb..5f96637 100644 --- a/testdata/http_server/execute/local_test.data +++ b/testdata/http_server/execute/local_test.data @@ -28,11 +28,11 @@ event: begin data: "2023-11-26T15:21:00Z" event: message -data: "----/--/-- --:--:-- === BEGIN: local /local.aww 1-\n" +data: " === BEGIN: local /local.aww 1-\n" id: 0 event: message -data: "----/--/-- --:--:-- --> 1: echo \"test\"\n" +data: " --> 1: echo \"test\"\n" id: 1 event: message @@ -40,7 +40,7 @@ data: "test\n" id: 2 event: message -data: "----/--/-- --:--:-- === END: local /local.aww 1-\n" +data: " === END: local /local.aww 1-\n" id: 3 event: end diff --git a/testdata/local/cancel_test.data b/testdata/local/cancel_test.data index 357ec8b..cdd9f44 100644 --- a/testdata/local/cancel_test.data +++ b/testdata/local/cancel_test.data @@ -1,3 +1,3 @@ <<< cancel -----/--/-- --:--:-- === BEGIN: local testdata/local/cancel.aww 1 -----/--/-- --:--:-- --> 1: sleep 300 + === BEGIN: local testdata/local/cancel.aww 1 + --> 1: sleep 300 diff --git a/testdata/local/local_encrypted.data b/testdata/local/local_encrypted.data index 045e884..ad9b375 100644 --- a/testdata/local/local_encrypted.data +++ b/testdata/local/local_encrypted.data @@ -1,7 +1,7 @@ <<< echo_encrypted:stdout -----/--/-- --:--:-- === BEGIN: local testdata/local/local_encrypted.aww 3 -----/--/-- --:--:-- --> 3: echo this_is_a_secret -----/--/-- --:--:-- === END: local testdata/local/local_encrypted.aww 3 + === BEGIN: local testdata/local/local_encrypted.aww 3 + --> 3: echo this_is_a_secret + === END: local testdata/local/local_encrypted.aww 3 <<< echo_encrypted:stderr this_is_a_secret @@ -11,7 +11,7 @@ this_is_a_secret Local: NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty <<< echo_encrypted_no_pass:stderr -----/--/-- --:--:-- !!! NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty + !!! NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty <<< echo_encrypted_no_pass:stdout @@ -19,7 +19,7 @@ Local: NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "loc Local: NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect <<< echo_encrypted_invalid_pass:stderr -----/--/-- --:--:-- !!! NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect + !!! NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect <<< echo_encrypted_invalid_pass:stdout @@ -30,6 +30,6 @@ this_is_a_secret_in_sub <<< sub_echo_encrypted:stdout -----/--/-- --:--:-- === BEGIN: local testdata/local/sub/local_encrypted.aww 1 -----/--/-- --:--:-- --> 1: echo this_is_a_secret_in_sub -----/--/-- --:--:-- === END: local testdata/local/sub/local_encrypted.aww 1 + === BEGIN: local testdata/local/sub/local_encrypted.aww 1 + --> 1: echo this_is_a_secret_in_sub + === END: local testdata/local/sub/local_encrypted.aww 1 diff --git a/testdata/local/local_test.data b/testdata/local/local_test.data index 5d1ce26..92d4f42 100644 --- a/testdata/local/local_test.data +++ b/testdata/local/local_test.data @@ -7,14 +7,14 @@ local <<< [stdout] local.aww 1- -----/--/-- --:--:-- === BEGIN: local testdata/local/local.aww 1- -----/--/-- --:--:-- --> 1: echo "hello" -----/--/-- --:--:-- --> 3: #local: echo "nothing" -----/--/-- --:--:-- --> 5: echo "local" -----/--/-- --:--:-- === END: local testdata/local/local.aww 1- + === BEGIN: local testdata/local/local.aww 1- + --> 1: echo "hello" + --> 3: #local: echo "nothing" + --> 5: echo "local" + === END: local testdata/local/local.aww 1- <<< [stderr] local.aww 100- <<< [stdout] local.aww 100- -----/--/-- --:--:-- === BEGIN: local testdata/local/local.aww 100- -----/--/-- --:--:-- === END: local testdata/local/local.aww 100- + === BEGIN: local testdata/local/local.aww 100- + === END: local testdata/local/local.aww 100- diff --git a/testdata/play/awwanssh.test/play_test.data b/testdata/play/awwanssh.test/play_test.data index 46445e8..e67163f 100644 --- a/testdata/play/awwanssh.test/play_test.data +++ b/testdata/play/awwanssh.test/play_test.data @@ -1,11 +1,11 @@ Test on "play" command. <<< play_with_local:output -----/--/-- --:--:-- --- SSH connection: awwanssh@127.0.0.1:10022 -----/--/-- --:--:-- --- SSH identity file: [/home/awwan/.ssh/id_ed25519] -----/--/-- --:--:-- === BEGIN: play testdata/play/awwanssh.test/play.aww 1- -----/--/-- --:--:-- --> 2: pwd + --- SSH connection: awwanssh@127.0.0.1:10022 + --- SSH identity file: [/home/awwan/.ssh/id_ed25519] + === BEGIN: play testdata/play/awwanssh.test/play.aww 1- + --> 2: pwd /home/awwanssh -----/--/-- --:--:-- --> 5: #local: pwd + --> 5: #local: pwd /home/awwan/src -----/--/-- --:--:-- === END: play testdata/play/awwanssh.test/play.aww 1- + === END: play testdata/play/awwanssh.test/play.aww 1- -- cgit v1.3