diff --git a/docker-compose/setup-script/tests/configure/stop.bats b/docker-compose/setup-script/tests/configure/stop.bats index d28d15333f..ea28380f18 100755 --- a/docker-compose/setup-script/tests/configure/stop.bats +++ b/docker-compose/setup-script/tests/configure/stop.bats @@ -21,7 +21,7 @@ teardown() { cd "${NOCO_HOME}" || exit 1 # Verify container is not running - docker compose ps | grep -q 'redis' && fail "Redis is running" - docker compose ps | grep -q 'watchtower' && fail "WatchTower is running" - docker compose ps | grep -q 'nocodb' && fail "NocoDB is running" + docker compose ps | grep -q 'redis' && exit 1 + docker compose ps | grep -q 'watchtower' && exit 1 + docker compose ps | grep -q 'nocodb' && exit 1 } diff --git a/docker-compose/setup-script/tests/expects/configure/monitor.sh b/docker-compose/setup-script/tests/expects/configure/monitor.sh index 710672a175..ba7479de81 100755 --- a/docker-compose/setup-script/tests/expects/configure/monitor.sh +++ b/docker-compose/setup-script/tests/expects/configure/monitor.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/configure/restart.sh b/docker-compose/setup-script/tests/expects/configure/restart.sh index 22c358bc59..7abddf658c 100755 --- a/docker-compose/setup-script/tests/expects/configure/restart.sh +++ b/docker-compose/setup-script/tests/expects/configure/restart.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/configure/scale.sh b/docker-compose/setup-script/tests/expects/configure/scale.sh index d51b9221da..2f3196ade7 100755 --- a/docker-compose/setup-script/tests/expects/configure/scale.sh +++ b/docker-compose/setup-script/tests/expects/configure/scale.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/configure/start.sh b/docker-compose/setup-script/tests/expects/configure/start.sh index 7e52e1a7ae..ed8796c965 100755 --- a/docker-compose/setup-script/tests/expects/configure/start.sh +++ b/docker-compose/setup-script/tests/expects/configure/start.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/configure/stop.sh b/docker-compose/setup-script/tests/expects/configure/stop.sh old mode 100644 new mode 100755 index 830dc438bc..78ef89592a --- a/docker-compose/setup-script/tests/expects/configure/stop.sh +++ b/docker-compose/setup-script/tests/expects/configure/stop.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/configure/upgrade.sh b/docker-compose/setup-script/tests/expects/configure/upgrade.sh index d45ccda9f1..c03edb366d 100755 --- a/docker-compose/setup-script/tests/expects/configure/upgrade.sh +++ b/docker-compose/setup-script/tests/expects/configure/upgrade.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh expect "Do you want to reinstall NocoDB*" diff --git a/docker-compose/setup-script/tests/expects/install/default.sh b/docker-compose/setup-script/tests/expects/install/default.sh index 9dc978704e..fa4fb58d3a 100755 --- a/docker-compose/setup-script/tests/expects/install/default.sh +++ b/docker-compose/setup-script/tests/expects/install/default.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/expects/install/ip.sh b/docker-compose/setup-script/tests/expects/install/ip.sh index ab767dfcb6..957a677efe 100755 --- a/docker-compose/setup-script/tests/expects/install/ip.sh +++ b/docker-compose/setup-script/tests/expects/install/ip.sh @@ -5,6 +5,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/expects/install/redis.sh b/docker-compose/setup-script/tests/expects/install/redis.sh index 5f87ce533a..c3420a3007 100755 --- a/docker-compose/setup-script/tests/expects/install/redis.sh +++ b/docker-compose/setup-script/tests/expects/install/redis.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/expects/install/scale.sh b/docker-compose/setup-script/tests/expects/install/scale.sh index 3d75a3b350..584fb87cf7 100755 --- a/docker-compose/setup-script/tests/expects/install/scale.sh +++ b/docker-compose/setup-script/tests/expects/install/scale.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/expects/install/ssl.sh b/docker-compose/setup-script/tests/expects/install/ssl.sh index f8b4769701..229896067d 100755 --- a/docker-compose/setup-script/tests/expects/install/ssl.sh +++ b/docker-compose/setup-script/tests/expects/install/ssl.sh @@ -6,6 +6,8 @@ set timeout 10 set random_number [lindex $argv 0] # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/expects/install/watchtower.sh b/docker-compose/setup-script/tests/expects/install/watchtower.sh index 8fc835b93e..eeb4f6e493 100755 --- a/docker-compose/setup-script/tests/expects/install/watchtower.sh +++ b/docker-compose/setup-script/tests/expects/install/watchtower.sh @@ -4,6 +4,8 @@ set timeout 10 # Start your main script +set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)" + spawn bash ../../noco.sh # Respond to script prompts diff --git a/docker-compose/setup-script/tests/mocks/clear b/docker-compose/setup-script/tests/mocks/clear new file mode 100755 index 0000000000..e08f792e8f --- /dev/null +++ b/docker-compose/setup-script/tests/mocks/clear @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "--- Clear Mock ---" \ No newline at end of file diff --git a/docker-compose/setup-script/tests/mocks/nproc b/docker-compose/setup-script/tests/mocks/nproc new file mode 100755 index 0000000000..1d83c4a9b0 --- /dev/null +++ b/docker-compose/setup-script/tests/mocks/nproc @@ -0,0 +1,3 @@ +#!/bin/bash + +echo 4 \ No newline at end of file