From 5cfe44ab72a73eb805707d39e9237e7e173a9098 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Fri, 21 Mar 2025 12:15:06 +0100 Subject: [PATCH] Check stable output in file_vault_client test Just output the date (not hours and minutes) in ls as RTC is fixed to 2018-01-01 00:01. Issue #4371 --- repos/gems/run/file_vault_client.run | 20 ++++++++++---------- repos/gems/run/file_vault_client_1.sh | 8 +++++--- repos/gems/run/file_vault_client_2.sh | 6 ++++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/repos/gems/run/file_vault_client.run b/repos/gems/run/file_vault_client.run index 9c40892d93..5c9d4233ea 100644 --- a/repos/gems/run/file_vault_client.run +++ b/repos/gems/run/file_vault_client.run @@ -420,11 +420,11 @@ grep_output {\[init -> dynamic_init -> log_terminal\].*} if {[container_initialized]} { compare_output_to { [init -> dynamic_init -> log_terminal] total 1 -[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 Jan 1 1970 dir_1 -[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan 1 1970 file_1 -[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 Jan 1 1970 lost+found +[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 1970-01-01 dir_1 +[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 2018-01-01 file_1 +[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 2018-01-01 lost+found [init -> dynamic_init -> log_terminal] total 1 -[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 Jan 1 1970 file_2 +[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 2018-01-01 file_2 [init -> dynamic_init -> log_terminal] Ein zweiter Test. [init -> dynamic_init -> log_terminal] Eine weitere Datei. [init -> dynamic_init -> log_terminal] Mit mehr Inhalt. @@ -435,19 +435,19 @@ if {[container_initialized]} { [init -> dynamic_init -> log_terminal] Hallo Welt! [init -> dynamic_init -> log_terminal] Ein zweiter Test. [init -> dynamic_init -> log_terminal] total 1 -[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan 1 1970 file_1 -[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 Jan 1 1970 lost+found +[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 2018-01-01 file_1 +[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 2018-01-01 lost+found [init -> dynamic_init -> log_terminal] Eine weitere Datei. [init -> dynamic_init -> log_terminal] Mit mehr Inhalt. [init -> dynamic_init -> log_terminal] Eine weitere Datei. [init -> dynamic_init -> log_terminal] Mit mehr Inhalt. [init -> dynamic_init -> log_terminal] Und Sonderzeichen: /.:($)=%! [init -> dynamic_init -> log_terminal] total 1 -[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 Jan 1 1970 dir_1 -[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan 1 1970 file_1 -[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 Jan 1 1970 lost+found +[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 1970-01-01 dir_1 +[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 2018-01-01 file_1 +[init -> dynamic_init -> log_terminal] drwx------ 1 root 0 0 2018-01-01 lost+found [init -> dynamic_init -> log_terminal] total 1 -[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 Jan 1 1970 file_2 +[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 2018-01-01 file_2 } } diff --git a/repos/gems/run/file_vault_client_1.sh b/repos/gems/run/file_vault_client_1.sh index ba7eb49141..df50d94234 100644 --- a/repos/gems/run/file_vault_client_1.sh +++ b/repos/gems/run/file_vault_client_1.sh @@ -1,15 +1,17 @@ #!/bin/bash +ls="ls -la --time-style=+%F" + echo "Hallo Welt!" > file_vault/file_1 cat file_vault/file_1 echo "Ein zweiter Test." > file_vault/file_1 cat file_vault/file_1 -ls -la file_vault/ +$ls file_vault/ mkdir file_vault/dir_1 echo "Eine weitere Datei." > file_vault/dir_1/file_2 echo "Mit mehr Inhalt." >> file_vault/dir_1/file_2 cat file_vault/dir_1/file_2 echo "Und Sonderzeichen: /.:($)=%!" >> file_vault/dir_1/file_2 cat file_vault/dir_1/file_2 -ls -la file_vault/ -ls -la file_vault/dir_1 +$ls file_vault/ +$ls file_vault/dir_1 exit 0 diff --git a/repos/gems/run/file_vault_client_2.sh b/repos/gems/run/file_vault_client_2.sh index 44cacbb1db..9d17a41655 100644 --- a/repos/gems/run/file_vault_client_2.sh +++ b/repos/gems/run/file_vault_client_2.sh @@ -1,6 +1,8 @@ #!/bin/bash -ls -la file_vault/ -ls -la file_vault/dir_1 +ls="ls -la --time-style=+%F" + +$ls file_vault/ +$ls file_vault/dir_1 cat file_vault/file_1 cat file_vault/dir_1/file_2 exit 0