X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fclean%2Fserver%2Ftest.sh;h=dbd399aaa5172a89981ca606e885dade2a3133bc;hb=0e9c3b2810aa3fc8bbf5275e42ce621efc6cdb66;hp=3b8fe39edee1222897581fb1537c533eeab4fd68;hpb=57c36b277e68b764dd34cb2e449f6e2ca3d1e9b6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index 3b8fe39ed..dbd399aaa 100755
--- a/scripts/clean/server/test.sh
+++ b/scripts/clean/server/test.sh
@@ -2,15 +2,44 @@
 
 set -eu
 
-for i in $(seq 1 6); do
-  dbname="peertube_test$i"
+recreateDB () {
+  dbname="peertube_test$1"
+
+  dropdb --if-exists "$dbname" 2>&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" ~/.config/PeerTube/CLI-$1
+}
+
+dropRedis () {
+  port=$((9000+$1))
+  host="localhost"
+
+  if [ ! -z ${GITLAB_CI+x} ]; then
+    host="redis"
+  fi
+
+  redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
+  redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
+  redis-cli -h "$host" KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
+}
+
+seq=$(seq 1 6)
+
+if [ ! -z ${1+x} ]; then
+  seq=$1
+fi
+
+
+for i in $seq; do
+  recreateDB "$i" &
+  dropRedis "$i" &
+  removeFiles "$i" &
 done
+
+wait