From b786e002328e0aad07596b813b85b508d943fc0f Mon Sep 17 00:00:00 2001 From: JonJagger Date: Wed, 8 Nov 2023 20:28:47 +0000 Subject: [PATCH] Update test_010_down.sh --- README.md | 2 +- test/sh/test_010_down.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 13ee551..e1e8b1c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Github Action (main)](https://github.com/cyber-dojo/commander/actions/workflows/main.yml/badge.svg)](https://github.com/cyber-dojo/commander/actions) - The main [cyber-dojo](https://github.com/cyber-dojo/commander/blob/main/cyber-dojo) bash script to control a cyber-dojo server -- The [cyberdojo/commander](https://hub.docker.com/r/cyberdojo/commander/tags) Docker image which `cyber-dojo` delegates to. +- The [cyberdojo/commander](https://hub.docker.com/r/cyberdojo/commander/tags) Docker image which the `cyber-dojo` bash script delegates to. diff --git a/test/sh/test_010_down.sh b/test/sh/test_010_down.sh index 2b5d932..870c1bd 100755 --- a/test/sh/test_010_down.sh +++ b/test/sh/test_010_down.sh @@ -46,8 +46,9 @@ test_____no_args_stops_and_removes_server_containers() refuteStdoutIncludes 'variable is not set. Defaulting to a blank string.' for service in custom_start_points exercises_start_points languages_start_points "${service_names[@]}" do - assertStdoutIncludes "Container cyber_dojo_${service} Stopping" - assertStdoutIncludes "Container cyber_dojo_${service} Removing" + service_underscore="$(echo $service | tr '-' '_')" + assertStdoutIncludes "Container cyber_dojo_${service_underscore} Stopping" + assertStdoutIncludes "Container cyber_dojo_${service_underscore} Removing" done assertNoStderr