✅ fixed tests

Author: jcaillon

tests.d/cli-logging/01.logging.sh

@@ -13,7 +13,6 @@ function test_logLevelOptions() {
   test::title "✅ Logging level through an environment variable"
   test::exec VALET_LOG_LEVEL=success "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
 
-
   test::title "✅ Logging level with --log-level option"
   test::exec "${GLOBAL_INSTALLATION_DIRECTORY}/valet" --log-level warning self mock1 logging-level
 
@@ -31,34 +30,30 @@ function test_logLevelOptions() {
   test::title "✅ Logging level with --verbose option"
   test::exec "${GLOBAL_INSTALLATION_DIRECTORY}/valet" -v self mock1 logging-level
 
-
   test::title "✅ Logging level with DEBUG set (also activates profiling)"
   test::exec DEBUG=1 "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
 
   unset -f test::scrubOutput
 }
 
-
 function test_logDisplayOptions() {
   test::title "✅ Testing that we can change the log display options"
   export VALET_CONFIG_LOG_PATTERN='<level>_<message>'
   test::exec VALET_CONFIG_LOG_COLUMNS=40 VALET_CONFIG_ENABLE_COLORS=true VALET_CONFIG_ENABLE_NERDFONT_ICONS=true VALET_CONFIG_LOG_DISABLE_WRAP=false VALET_CONFIG_LOG_DISABLE_HIGHLIGHT=false "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
   export VALET_CONFIG_LOG_PATTERN="<level> <message>"
 }
 
-
 function test_logOutputOptions() {
   fs::createTempDirectory
   local logDir="${REPLY}"
 
   test::title "✅ Testing that we can output the logs to a directory additionally to console"
   test::exec VALET_CONFIG_LOG_TO_DIRECTORY="${logDir}" "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
   # shellcheck disable=SC2317
-  function test::scrubOutput() { GLOBAL_TEST_OUTPUT_CONTENT="${GLOBAL_TEST_OUTPUT_CONTENT//????-??-??T??-??-??+????--PID_??????.log/2025-02-12T21-57-29+0000.log}" ; }
+  function test::scrubOutput() { GLOBAL_TEST_OUTPUT_CONTENT="${GLOBAL_TEST_OUTPUT_CONTENT//????-??-??T??-??-??+????--PID_??????.log/2025-02-12T21-57-29+0000.log}"; }
   test::func fs::listFiles "${logDir}"
   unset -f test::scrubOutput
 
-
   test::title "✅ Testing that we can output the logs to a specific file name additionally to console"
   test::exec VALET_CONFIG_LOG_FILENAME_PATTERN='logFile=test.log' VALET_CONFIG_LOG_TO_DIRECTORY="true" "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
   core::getUserStateDirectory
@@ -71,7 +66,8 @@ function test_logOutputOptions() {
   test::title "✅ Testing that we can output the logs to a specific numbered fd"
   local myFd
   exec {myFd}>>"${logDir}/test3.log"
-  test::exec VALET_CONFIG_LOG_FD="${myFd}" "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
+  test::prompt export VALET_CONFIG_LOG_FD=11
+  VALET_CONFIG_LOG_FD="${myFd}" test::exec "${GLOBAL_INSTALLATION_DIRECTORY}/valet" self mock1 logging-level
   test::exec fs::cat "${logDir}/test3.log"
 }
 

tests.d/lib-log/00.log.sh

@@ -18,7 +18,6 @@ function main() {
   test::exec styles::init
   test_log
 
-
   test::title "✅ Testing with full formatting"
   VALET_CONFIG_ENABLE_COLORS=true
   VALET_CONFIG_ENABLE_NERDFONT_ICONS=true
@@ -57,6 +56,11 @@ function test_log::printCallStack() {
 function test_log::init() {
   test::title "✅ Testing log::init"
 
+  # shellcheck disable=SC2317
+  function test::scrubOutput() {
+    GLOBAL_TEST_OUTPUT_CONTENT="${GLOBAL_TEST_OUTPUT_CONTENT//" 1>&"[0-9][0-9]/" 1>&11"}"
+  }
+
   # test bad descriptors
   test::exit VALET_CONFIG_LOG_FD=5 log::init
   test::exit VALET_CONFIG_LOG_FD=/unknown/file/path log::init
@@ -81,6 +85,8 @@ function test_log::init() {
 
   test::exec VALET_CONFIG_LOG_FD="${GLOBAL_TEST_TEMP_FILE}" VALET_CONFIG_LOG_TO_DIRECTORY=true VALET_CONFIG_LOG_FILENAME_PATTERN="logFile=a" log::init
   test::printVars GLOBAL_LOG_PRINT_STATEMENT_FORMATTED_LOG GLOBAL_LOG_PRINT_STATEMENT_STANDARD GLOBAL_LOG_WRAP_PADDING
+
+  unset -f test::scrubOutput
 }
 
 function test_log::parseLogPattern() {

version

@@ -1 +1 @@
-0.37.8
+0.37.11