Merge branch 'develop' into cli-wrapper

1 files changed, 21 insertions, 8 deletions

diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index 3b8fe39ed..235ff52cc 100755
--- a/scripts/clean/server/test.sh
+++ b/scripts/clean/server/test.sh
@@ -2,15 +2,28 @@
 
 set -eu
 
-for i in $(seq 1 6); do
-  dbname="peertube_test$i"
+recreateDB () {
+  dbname="peertube_test$1"
 
   dropdb --if-exists "$dbname"
-  rm -rf "./test$i"
-  rm -f "./config/local-test.json"
-  rm -f "./config/local-test-$i.json"
+
   createdb -O peertube "$dbname"
-  psql -c "CREATE EXTENSION pg_trgm;" "$dbname"
-  psql -c "CREATE EXTENSION unaccent;" "$dbname"
-  redis-cli KEYS "bull-localhost:900$i*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
+  psql -c "CREATE EXTENSION pg_trgm;" "$dbname" &
+  psql -c "CREATE EXTENSION unaccent;" "$dbname" &
+}
+
+removeFiles () {
+  rm -rf "./test$1" "./config/local-test.json" "./config/local-test-$1.json"
+}
+
+dropRedis () {
+  redis-cli KEYS "bull-localhost:900$1*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
+}
+
+for i in $(seq 1 6); do
+  recreateDB "$i" &
+  dropRedis "$i" &
+  removeFiles "$i" &
 done
+
+wait