From abee22df395073790179c7f9ad5550d66b788c46 Mon Sep 17 00:00:00 2001 From: Carlos Robles Date: Tue, 5 Mar 2024 04:18:12 +0000 Subject: [PATCH] Last version --- .github/actions/smoke-test/build.sh | 2 +- .github/actions/smoke-test/test.sh | 2 +- test/dab-mssql/aspnetapp.csproj | 3 +-- test/test-utils/test-utils.sh | 32 +++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) mode change 100644 => 100755 .github/actions/smoke-test/build.sh mode change 100644 => 100755 .github/actions/smoke-test/test.sh create mode 100644 test/test-utils/test-utils.sh diff --git a/.github/actions/smoke-test/build.sh b/.github/actions/smoke-test/build.sh old mode 100644 new mode 100755 index c134ae5..2814ea4 --- a/.github/actions/smoke-test/build.sh +++ b/.github/actions/smoke-test/build.sh @@ -40,7 +40,7 @@ popd TEST_DIR="test/${TEMPLATE_ID}" if [ -d "${TEST_DIR}" ] ; then echo "(*) Copying test folder" - DEST_DIR="${SRC_DIR}/test-project" + DEST_DIR="${SRC_DIR}/dab-mssql" mkdir -p ${DEST_DIR} cp -Rp ${TEST_DIR}/* ${DEST_DIR} cp test/test-utils/test-utils.sh ${DEST_DIR} diff --git a/.github/actions/smoke-test/test.sh b/.github/actions/smoke-test/test.sh old mode 100644 new mode 100755 index 2fdb6af..bdcd007 --- a/.github/actions/smoke-test/test.sh +++ b/.github/actions/smoke-test/test.sh @@ -6,7 +6,7 @@ SRC_DIR="/tmp/${TEMPLATE_ID}" echo "Running Smoke Test" ID_LABEL="test-container=${TEMPLATE_ID}" -devcontainer exec --workspace-folder "${SRC_DIR}" --id-label ${ID_LABEL} /bin/sh -c 'set -e && if [ -f "test-project/test.sh" ]; then cd test-project && if [ "$(id -u)" = "0" ]; then chmod +x test.sh; else sudo chmod +x test.sh; fi && ./test.sh; else ls -a; fi' +devcontainer exec --workspace-folder "${SRC_DIR}" --id-label ${ID_LABEL} /bin/sh -c 'set -e && if [ -f "dab-mssql/test.sh" ]; then cd dab-mssql && if [ "$(id -u)" = "0" ]; then chmod +x test.sh; else sudo chmod +x test.sh; fi && ./test.sh; else ls -a; fi' # Clean up docker rm -f $(docker container ls -f "label=${ID_LABEL}" -q) diff --git a/test/dab-mssql/aspnetapp.csproj b/test/dab-mssql/aspnetapp.csproj index 7e9eb94..796aef2 100644 --- a/test/dab-mssql/aspnetapp.csproj +++ b/test/dab-mssql/aspnetapp.csproj @@ -1,9 +1,8 @@ - net5.0 + net6.0 - \ No newline at end of file diff --git a/test/test-utils/test-utils.sh b/test/test-utils/test-utils.sh new file mode 100644 index 0000000..5e4b4ae --- /dev/null +++ b/test/test-utils/test-utils.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +FAILED=() + +echoStderr() +{ + echo "$@" 1>&2 +} + +check() { + LABEL=$1 + shift + echo -e "\n🧪 Testing $LABEL" + if "$@"; then + echo "✅ Passed!" + return 0 + else + echoStderr "❌ $LABEL check failed." + FAILED+=("$LABEL") + return 1 + fi +} + +reportResults() { + if [ ${#FAILED[@]} -ne 0 ]; then + echoStderr -e "\n💥 Failed tests: ${FAILED[@]}" + exit 1 + else + echo -e "\n💯 All passed!" + exit 0 + fi +}