tests

rlespinasse · Oct 23, 2023 · 12a5041 · 12a5041
1 parent c5e0864
commit 12a5041
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/tests/base.bats b/tests/base.bats
@@ -9,6 +9,7 @@ docker_test() {
   shift
   shift
   shift
+  echo docker container run -t $docker_opts -w /data -v $(pwd)/${data_folder:-}:/data ${DOCKER_IMAGE} "$@" >>tests/output/$output_file-command.log
   run docker container run -t $docker_opts -w /data -v $(pwd)/${data_folder:-}:/data ${DOCKER_IMAGE} "$@"
 
   # Remove timed logging tags on electron logs by default.
@@ -17,8 +18,9 @@ docker_test() {
   [ "$status" -eq $status ]
   if [ -f "tests/expected/$output_file.log" ]; then
     [ "$(diff --strip-trailing-cr "tests/output/$output_file-comp.log" "tests/expected/$output_file.log")" = "" ]
-  fi
-  if [ -f "tests/expected/uniq-$output_file.log" ]; then
+  elif [ -f "tests/expected/uniq-$output_file.log" ]; then
     [ "$(diff --strip-trailing-cr <(sort -u "tests/output/$output_file-comp.log") "tests/expected/uniq-$output_file.log")" = "" ]
+  else
+    echo "No output test file at 'tests/expected/[uniq-]$output_file.log'"
   fi
 }
diff --git a/tests/expected/output-nothing.log → tests/expected/output-check-command.log b/tests/expected/output-nothing.log → tests/expected/output-check-command.log
diff --git a/tests/expected/output-create-command.log b/tests/expected/output-create-command.log
@@ -0,0 +1 @@
+
diff --git a/tests/expected/output-wrong-command.log b/tests/expected/output-wrong-command.log
@@ -0,0 +1 @@
+
diff --git a/tests/timeout.bats b/tests/timeout.bats
@@ -3,13 +3,13 @@
 . tests/base.bats
 
 @test "Timeout for using create command" {
-  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-nothing" "tests" --create output/empty.drawio
+  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-create-command" "tests" --create output/empty.drawio
 }
 
 @test "Timeout for using check command" {
-  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-nothing" "tests" --check output/empty.drawio
+  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-check-command" "tests" --check output/empty.drawio
 }
 
 @test "Timeout for using wrong command" {
-  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-nothing" "tests/data" --wrong-command
+  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-wrong-command" "tests/data" --wrong-command
 }