Cleanup of run_tests.sh script
This commit is contained in:
@@ -247,7 +247,6 @@ This should be okay, right?
|
|||||||
</p>
|
</p>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
comment="svelte recommends against autofocus for accessibility reasons. Therefore removed autofocus command for this input"
|
|
||||||
class="col-start-1 row-start-1 bg-transparent w-full p-4 outline-none bg-gray-700 rounded"
|
class="col-start-1 row-start-1 bg-transparent w-full p-4 outline-none bg-gray-700 rounded"
|
||||||
bind:value={input}
|
bind:value={input}
|
||||||
/>
|
/>
|
||||||
|
|||||||
+5
-10
@@ -9,18 +9,13 @@ run_tests() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
$CONTAINER_BIN container stop classquiz_db
|
$CONTAINER_BIN compose -f docker-compose.dev.yml down --volumes
|
||||||
$CONTAINER_BIN container stop test_redis
|
|
||||||
$CONTAINER_BIN container stop test_meili
|
|
||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
mkdir /tmp/storage
|
mkdir /tmp/storage
|
||||||
$CONTAINER_BIN run --rm -d -p 6379:6379 --name test_redis redis:alpine
|
$CONTAINER_BIN compose -f docker-compose.dev.yml up -d
|
||||||
$CONTAINER_BIN run -it --rm -d -p 7700:7700 --name test_meili getmeili/meilisearch:v0.28.0
|
sleep 2
|
||||||
$CONTAINER_BIN volume create classquiz_db_data
|
|
||||||
$CONTAINER_BIN run --name classquiz_db -p 5432:5432 --rm -d -e POSTGRES_PASSWORD=mysecretpassword -v classquiz_db_data:/var/lib/postgresql/data -e POSTGRES_DB=classquiz postgres
|
|
||||||
sleep 1
|
|
||||||
pipenv run alembic upgrade head
|
pipenv run alembic upgrade head
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,14 +23,14 @@ case $1 in
|
|||||||
+) init ;;
|
+) init ;;
|
||||||
-) stop ;;
|
-) stop ;;
|
||||||
a)
|
a)
|
||||||
$CONTAINER_BIN volume rm classquiz_db_data
|
$CONTAINER_BIN volume rm classquiz_db
|
||||||
init
|
init
|
||||||
run_tests
|
run_tests
|
||||||
stop
|
stop
|
||||||
;;
|
;;
|
||||||
prepare)
|
prepare)
|
||||||
stop
|
stop
|
||||||
$CONTAINER_BIN volume rm classquiz_db_data
|
$CONTAINER_BIN volume rm cclassquiz_db
|
||||||
init
|
init
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: MPL-2.0
|
|
||||||
|
|
||||||
CONTAINER_BIN=podman
|
|
||||||
|
|
||||||
run_tests() {
|
|
||||||
pipenv run coverage run -m pytest -s -v --asyncio-mode=strict classquiz/tests
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
$CONTAINER_BIN container stop classquiz_db --time 2
|
|
||||||
$CONTAINER_BIN container stop test_redis --time 2
|
|
||||||
$CONTAINER_BIN container stop test_meili --time 2
|
|
||||||
$CONTAINER_BIN rm classquiz_db --force
|
|
||||||
$CONTAINER_BIN rm test_redis --force
|
|
||||||
$CONTAINER_BIN rm test_meili --force
|
|
||||||
}
|
|
||||||
|
|
||||||
init() {
|
|
||||||
if [ ! -d /tmp/storage ]; then
|
|
||||||
mkdir /tmp/storage
|
|
||||||
fi
|
|
||||||
|
|
||||||
$CONTAINER_BIN run --rm -d -p 6379:6379 --name test_redis docker.io/redis:buster
|
|
||||||
$CONTAINER_BIN run -it --rm -d -p 7700:7700 --name test_meili docker.io/getmeili/meilisearch:v0.28.0
|
|
||||||
$CONTAINER_BIN volume create classquiz_db_data
|
|
||||||
$CONTAINER_BIN run --name classquiz_db -p 5432:5432 --rm -d -e POSTGRES_PASSWORD=mysecretpassword -v classquiz_db_data:/var/lib/postgresql/data -e POSTGRES_DB=classquiz docker.io/postgres
|
|
||||||
sleep 1
|
|
||||||
pipenv run alembic upgrade head
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
+) init ;;
|
|
||||||
-) stop ;;
|
|
||||||
a)
|
|
||||||
$CONTAINER_BIN volume rm classquiz_db_data
|
|
||||||
init
|
|
||||||
run_tests
|
|
||||||
stop
|
|
||||||
;;
|
|
||||||
prepare)
|
|
||||||
stop
|
|
||||||
$CONTAINER_BIN volume rm classquiz_db_data
|
|
||||||
init
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid option: -$OPTARG" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
-12
@@ -1,12 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: MPL-2.0
|
|
||||||
|
|
||||||
if [ ! -d /tmp/storage ]; then
|
|
||||||
echo "making storage"
|
|
||||||
mkdir /tmp/storage
|
|
||||||
else
|
|
||||||
echo "storage already exists"
|
|
||||||
|
|
||||||
# end of file
|
|
||||||
fi
|
|
||||||
Reference in New Issue
Block a user