diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 4ad0d623a04d58df2c5174b3a5bbfc0845749a8b..43e5eff1171da8d69eb8897bea678bf90572570a 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -31,4 +31,4 @@ RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests RUN cd /git && pip3 install .[h5-crawler] WORKDIR /git/integrationtests -CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh +CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force diff --git a/integrationtests/test.sh b/integrationtests/test.sh index 3be4edb16c531a60c26b0de349ef942d90f627a0..36d1105e551fbb29664cb87c74be827cffa0308a 100755 --- a/integrationtests/test.sh +++ b/integrationtests/test.sh @@ -1,4 +1,18 @@ #!/bin/bash +if [ "$1" != "--force" ] +then + echo "Warning: For these tests, the whole database will be deleted. Do you want to proceed? (yes/Exit)" + read safety + if [ -z $safety ] + then + echo "Exiting..." + exit 0 + elif [ $safety != "yes" ] + then + echo "Exiting..." + exit 0 + fi +fi OUT=/tmp/crawler.output ls cat pycaosdb.ini diff --git a/src/doc/README_SETUP.md b/src/doc/README_SETUP.md new file mode 120000 index 0000000000000000000000000000000000000000..88332e357f5e06f3de522768ccdcd9e513c15f62 --- /dev/null +++ b/src/doc/README_SETUP.md @@ -0,0 +1 @@ +../../README_SETUP.md \ No newline at end of file diff --git a/src/doc/index.rst b/src/doc/index.rst index ee266598cd6cfbcfaa6f54b8e39aa32e4c2b6915..309624d5f6fe083cbcbf0287735d88f10e90dfba 100644 --- a/src/doc/index.rst +++ b/src/doc/index.rst @@ -13,8 +13,7 @@ This documentation helps you to :doc:`get started<getting_started>`, explains th Getting started <README_SETUP> Concepts <concepts> - tutorials - Caosdb-Crawler <crawler> + CaosDB Crawler <crawler> _apidoc/modules